summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 3.5Zachary Ware2016-08-041-1/+1
|\
| * Fix half-finished sentence.Zachary Ware2016-08-041-1/+1
| | | | | | | | Reported by Linda Pescatore on docs@.
* | Merge from 3.5Berker Peksag2016-08-041-1/+1
|\ \ | |/
| * Fix indentation of versionadded directive in IPv4Address.reverse_pointer docsBerker Peksag2016-08-041-1/+1
| |
* | Merge from 3.5Berker Peksag2016-08-041-7/+4
|\ \ | |/
| * Indent ipaddress.ip_address() example correctlyBerker Peksag2016-08-041-7/+4
| |
* | merge 3.5 (#27670)Benjamin Peterson2016-08-042-10/+22
|\ \ | |/
| * https link to the bug tracker (closes #27670)Benjamin Peterson2016-08-042-10/+22
| |
* | Issue #17599: Use unique _Py_REPARSE_DATA_BUFFER etc names to avoid conflictMartin Panter2016-08-044-16/+20
| | | | | | | | | | The conflict occurs with Min GW, which already defines REPARSE_DATA_BUFFER. Also, Min GW uses a lowercase <windows.h> filename.
* | Issue #27641: Merge cross-compiling improvement from 3.5Martin Panter2016-08-044-37/+21
|\ \ | |/
| * Issue #27641: Comment out regeneration rules when cross compilingMartin Panter2016-07-294-37/+21
| |
* | Issue #24278: Merge argument parsing docs from 3.5Martin Panter2016-08-041-14/+19
|\ \ | |/
| * Issue #24278: Explain how argument parsing output buffers are managedMartin Panter2016-08-031-14/+19
| |
* | Merge 3.5Donald Stufft2016-08-033-6/+6
|\ \ | |/
| * Merge 3.4Donald Stufft2016-08-033-6/+6
| |\
| | * Merge 3.3Donald Stufft2016-08-033-5/+5
| | |\
| | | * Switch upload.pypi.io to upload.pypi.orgDonald Stufft2016-08-033-4/+4
| | | |
* | | | Issue #23710: Merge from 3.5Berker Peksag2016-08-031-5/+9
|\ \ \ \ | |/ / /
| * | | Issue #23710: Update PyObject_HEAD documentationBerker Peksag2016-08-031-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since PEP 3123, PyObject_HEAD only has one field named ob_base. Users now need to use the Py_TYPE macro instead of self->ob_type. Initial patch by Ammar Askar.
* | | | Merge 3.5.Stefan Krah2016-08-031-0/+2
|\ \ \ \ | |/ / /
| * | | Issue #20767: Fix -R option for FreeBSD/clang.Stefan Krah2016-08-031-0/+2
| | | |
* | | | Issue #26576: Merge from 3.5Berker Peksag2016-08-031-4/+5
|\ \ \ \ | |/ / /
| * | | Issue #26576: Clarify that the @deco syntax is not always an equivalent of f ↵Berker Peksag2016-08-031-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | = deco(f) Patch by Chris Angelico.
* | | | Closes #27661: Added tzinfo keyword argument to datetime.combine.Alexander Belopolsky2016-08-025-24/+50
| | | |
* | | | Merge 3.5.Stefan Krah2016-08-021-1/+4
|\ \ \ \ | |/ / /
| * | | Issue #27241: Catch exception when running pstats as main.Stefan Krah2016-08-021-1/+4
| | | |
* | | | Issue #22557: Now importing already imported modules is up to 2.5 times faster.Serhiy Storchaka2016-08-026-246/+238
| | | |
* | | | [merge from 3.5] - Prevent HTTPoxy attack (CVE-2016-1000110)Senthil Kumaran2016-07-316-0/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates that the script is in CGI mode. Issue #27568 Reported and patch contributed by Rémi Rampin.
| * | | merge headsSenthil Kumaran2016-07-315-0/+42
| |\ \ \
| | * \ \ [merge from 3.4] - Prevent HTTPoxy attack (CVE-2016-1000110)Senthil Kumaran2016-07-315-0/+42
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates that the script is in CGI mode. Issue #27568 Reported and patch contributed by Rémi Rampin.
| | | * | [merge from 3.3] Prevent HTTPoxy attack (CVE-2016-1000110)Senthil Kumaran2016-07-315-0/+42
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates that the script is in CGI mode. Issue #27568 Reported and patch contributed by Rémi Rampin.
| | | | * Prevent HTTPoxy attack (CVE-2016-1000110)Senthil Kumaran2016-07-315-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates that the script is in CGI mode. Issue #27568 Reported and patch contributed by Rémi Rampin.
* | | | | merge 3.5 (#27656)Benjamin Peterson2016-07-312-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | all SCHED_ constants are optional (closes #27656)Benjamin Peterson2016-07-312-0/+8
| |/ / /
* | | | Issue 27366: PEP 487 docs updatesNick Coghlan2016-07-312-0/+16
| | | | | | | | | | | | | | | | | | | | - Porting note for type keyword arg handling - __init_subclass__ note regarding metaclass hint
* | | | Issue 24773: Use the standard Asia/Tehran name in the Iran test.Alexander Belopolsky2016-07-301-1/+1
| | | |
* | | | Issue #27652: Expose ESHUTDOWN conditionallyBerker Peksag2016-07-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | ESHUTDOWN is also exposed conditionally in Modules/errnomodule.c. Patch by Ed Schouten.
* | | | Issue #27366: Tweak PEP 487 documentationBerker Peksag2016-07-303-26/+30
| | | | | | | | | | | | | | | | | | | | | | | | * Added versionadded directives * Deleted duplicate sentence from __init_subclass__ docstring * Modernized tests
* | | | (merge from 3.5) Issue #27453: CPP invocation in configure must use CPPFLAGS.Xavier de Gaye2016-07-303-2/+5
|\ \ \ \ | |/ / / | | | | | | | | Patch by Chi Hsuan Yen.
| * | | Issue #27453: CPP invocation in configure must use CPPFLAGS.Xavier de Gaye2016-07-304-2/+6
| | | | | | | | | | | | | | | | Patch by Chi Hsuan Yen.
* | | | Issue #27366: Implement PEP 487Nick Coghlan2016-07-309-24/+411
| | | | | | | | | | | | | | | | | | | | | | | | - __init_subclass__ called when new subclasses defined - __set_name__ called when descriptors are part of a class definition
* | | | Merge from 3.5Berker Peksag2016-07-301-1/+1
|\ \ \ \ | |/ / /
| * | | Silence another "default role used" warning in typing.rstBerker Peksag2016-07-301-1/+1
| | | | | | | | | | | | | | | | This should make ware-docs green again.
* | | | Fix "default role used" warning in shlex.rstBerker Peksag2016-07-301-1/+1
| | | |
* | | | Fix whitespace.Guido van Rossum2016-07-291-1/+1
|\ \ \ \ | |/ / /
| * | | Fix whitespace.Guido van Rossum2016-07-291-1/+1
| | | |
* | | | Expand documentation about type aliases and NewType in the typing module ↵Guido van Rossum2016-07-291-1/+96
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | (merge 3.5 -> 3.6). By Michael Lee.
| * | | Expand documentation about type aliases and NewType in the typing module.Guido van Rossum2016-07-291-1/+96
| | | | | | | | | | | | | | | | By Michael Lee.
* | | | Closes #1521950: Made shlex parsing more shell-like.Vinay Sajip2016-07-293-32/+265
| | | |
* | | | Issue #17596: MINGW: add wincrypt.h in Python/random.cMartin Panter2016-07-292-0/+5
| | | | | | | | | | | | | | | | Based on patch by Roumen Petrov.