Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 3.5 | Zachary Ware | 2016-08-04 | 1 | -1/+1 |
|\ | |||||
| * | Fix half-finished sentence. | Zachary Ware | 2016-08-04 | 1 | -1/+1 |
| | | | | | | | | Reported by Linda Pescatore on docs@. | ||||
* | | Merge from 3.5 | Berker Peksag | 2016-08-04 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix indentation of versionadded directive in IPv4Address.reverse_pointer docs | Berker Peksag | 2016-08-04 | 1 | -1/+1 |
| | | |||||
* | | Merge from 3.5 | Berker Peksag | 2016-08-04 | 1 | -7/+4 |
|\ \ | |/ | |||||
| * | Indent ipaddress.ip_address() example correctly | Berker Peksag | 2016-08-04 | 1 | -7/+4 |
| | | |||||
* | | merge 3.5 (#27670) | Benjamin Peterson | 2016-08-04 | 2 | -10/+22 |
|\ \ | |/ | |||||
| * | https link to the bug tracker (closes #27670) | Benjamin Peterson | 2016-08-04 | 2 | -10/+22 |
| | | |||||
* | | Issue #17599: Use unique _Py_REPARSE_DATA_BUFFER etc names to avoid conflict | Martin Panter | 2016-08-04 | 4 | -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.5 | Martin Panter | 2016-08-04 | 4 | -37/+21 |
|\ \ | |/ | |||||
| * | Issue #27641: Comment out regeneration rules when cross compiling | Martin Panter | 2016-07-29 | 4 | -37/+21 |
| | | |||||
* | | Issue #24278: Merge argument parsing docs from 3.5 | Martin Panter | 2016-08-04 | 1 | -14/+19 |
|\ \ | |/ | |||||
| * | Issue #24278: Explain how argument parsing output buffers are managed | Martin Panter | 2016-08-03 | 1 | -14/+19 |
| | | |||||
* | | Merge 3.5 | Donald Stufft | 2016-08-03 | 3 | -6/+6 |
|\ \ | |/ | |||||
| * | Merge 3.4 | Donald Stufft | 2016-08-03 | 3 | -6/+6 |
| |\ | |||||
| | * | Merge 3.3 | Donald Stufft | 2016-08-03 | 3 | -5/+5 |
| | |\ | |||||
| | | * | Switch upload.pypi.io to upload.pypi.org | Donald Stufft | 2016-08-03 | 3 | -4/+4 |
| | | | | |||||
* | | | | Issue #23710: Merge from 3.5 | Berker Peksag | 2016-08-03 | 1 | -5/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Issue #23710: Update PyObject_HEAD documentation | Berker Peksag | 2016-08-03 | 1 | -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 Krah | 2016-08-03 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Issue #20767: Fix -R option for FreeBSD/clang. | Stefan Krah | 2016-08-03 | 1 | -0/+2 |
| | | | | |||||
* | | | | Issue #26576: Merge from 3.5 | Berker Peksag | 2016-08-03 | 1 | -4/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Issue #26576: Clarify that the @deco syntax is not always an equivalent of f ↵ | Berker Peksag | 2016-08-03 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | = deco(f) Patch by Chris Angelico. | ||||
* | | | | Closes #27661: Added tzinfo keyword argument to datetime.combine. | Alexander Belopolsky | 2016-08-02 | 5 | -24/+50 |
| | | | | |||||
* | | | | Merge 3.5. | Stefan Krah | 2016-08-02 | 1 | -1/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Issue #27241: Catch exception when running pstats as main. | Stefan Krah | 2016-08-02 | 1 | -1/+4 |
| | | | | |||||
* | | | | Issue #22557: Now importing already imported modules is up to 2.5 times faster. | Serhiy Storchaka | 2016-08-02 | 6 | -246/+238 |
| | | | | |||||
* | | | | [merge from 3.5] - Prevent HTTPoxy attack (CVE-2016-1000110) | Senthil Kumaran | 2016-07-31 | 6 | -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 heads | Senthil Kumaran | 2016-07-31 | 5 | -0/+42 |
| |\ \ \ | |||||
| | * \ \ | [merge from 3.4] - Prevent HTTPoxy attack (CVE-2016-1000110) | Senthil Kumaran | 2016-07-31 | 5 | -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 Kumaran | 2016-07-31 | 5 | -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 Kumaran | 2016-07-31 | 5 | -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 Peterson | 2016-07-31 | 2 | -0/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | all SCHED_ constants are optional (closes #27656) | Benjamin Peterson | 2016-07-31 | 2 | -0/+8 |
| |/ / / | |||||
* | | | | Issue 27366: PEP 487 docs updates | Nick Coghlan | 2016-07-31 | 2 | -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 Belopolsky | 2016-07-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Issue #27652: Expose ESHUTDOWN conditionally | Berker Peksag | 2016-07-30 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | ESHUTDOWN is also exposed conditionally in Modules/errnomodule.c. Patch by Ed Schouten. | ||||
* | | | | Issue #27366: Tweak PEP 487 documentation | Berker Peksag | 2016-07-30 | 3 | -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 Gaye | 2016-07-30 | 3 | -2/+5 |
|\ \ \ \ | |/ / / | | | | | | | | | Patch by Chi Hsuan Yen. | ||||
| * | | | Issue #27453: CPP invocation in configure must use CPPFLAGS. | Xavier de Gaye | 2016-07-30 | 4 | -2/+6 |
| | | | | | | | | | | | | | | | | Patch by Chi Hsuan Yen. | ||||
* | | | | Issue #27366: Implement PEP 487 | Nick Coghlan | 2016-07-30 | 9 | -24/+411 |
| | | | | | | | | | | | | | | | | | | | | | | | | - __init_subclass__ called when new subclasses defined - __set_name__ called when descriptors are part of a class definition | ||||
* | | | | Merge from 3.5 | Berker Peksag | 2016-07-30 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Silence another "default role used" warning in typing.rst | Berker Peksag | 2016-07-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This should make ware-docs green again. | ||||
* | | | | Fix "default role used" warning in shlex.rst | Berker Peksag | 2016-07-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix whitespace. | Guido van Rossum | 2016-07-29 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix whitespace. | Guido van Rossum | 2016-07-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Expand documentation about type aliases and NewType in the typing module ↵ | Guido van Rossum | 2016-07-29 | 1 | -1/+96 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | (merge 3.5 -> 3.6). By Michael Lee. | ||||
| * | | | Expand documentation about type aliases and NewType in the typing module. | Guido van Rossum | 2016-07-29 | 1 | -1/+96 |
| | | | | | | | | | | | | | | | | By Michael Lee. | ||||
* | | | | Closes #1521950: Made shlex parsing more shell-like. | Vinay Sajip | 2016-07-29 | 3 | -32/+265 |
| | | | | |||||
* | | | | Issue #17596: MINGW: add wincrypt.h in Python/random.c | Martin Panter | 2016-07-29 | 2 | -0/+5 |
| | | | | | | | | | | | | | | | | Based on patch by Roumen Petrov. |