summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Null mergeSerhiy Storchaka2016-06-030-0/+0
|\
| * Merge headsSerhiy Storchaka2016-06-033-5/+12
| |\
* | \ Merge headsSerhiy Storchaka2016-06-036-9/+51
|\ \ \
| * \ \ [merge from 3.5] - issue27113 - Document "check_same_thread" parameter in ↵Senthil Kumaran2016-06-031-0/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | sqlite3.connect api. Patch contributed by Dave Sawyer.
| | * | issue27113 - Document "check_same_thread" parameter in sqlite3.connect api.Senthil Kumaran2016-06-031-0/+5
| | | | | | | | | | | | | | | | Patch contributed by Dave Sawyer.
| * | | [merge from 3.5] - issue8519 - Reference termios and ioctl manual pages in ↵Senthil Kumaran2016-06-032-5/+7
| |\ \ \ | | |/ / | | | | | | | | the library documentation.
| | * | issue8519 - Reference termios and ioctl manual pages in the library ↵Senthil Kumaran2016-06-032-5/+7
| | | | | | | | | | | | | | | | documentation.
| * | | issue27167: make the test not care about the exact signal name in theGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)2016-06-031-1/+3
| | | | | | | | | | | | | | | | error message as some numbers map to multiple names.
| * | | Issue #27167: Clarify the subprocess.CalledProcessError error message textGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)2016-06-033-4/+37
| | | | | | | | | | | | | | | | when the child process died due to a signal.
* | | | Merge 3.5.Serhiy Storchaka2016-06-031-30/+32
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge headsSerhiy Storchaka2016-06-031-30/+32
| |\ \ | | |/ | |/|
| | * Issue #27185: Rename test_string_merged.py back to test_string.py.Serhiy Storchaka2016-06-031-0/+0
| | |
| | * Issue #27185: Merge test_pep292.py into test_string_merged.py.Serhiy Storchaka2016-06-032-250/+244
| | |\
| | | * Issue #27185: Rename test_pep292.py to test_string_merged.py.Serhiy Storchaka2016-06-031-0/+0
| | | |
| | * | Issue #27185: Rename test_string.py to test_string_merged.py.Serhiy Storchaka2016-06-031-0/+0
| | |/
* | | issue25931: document that socketserver.Forking* are unavailable on platformsGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)2016-06-031-0/+4
| | | | | | | | | | | | lacking os.fork().
* | | Issue25931: fix tests broken by the conditional define of socketserver.Forking*Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)2016-06-031-6/+7
| | |
* | | typo fixGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)2016-06-031-1/+1
| | |
* | | merge 3.5Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)2016-06-031-1/+2
|\ \ \ | |/ /
| * | Document that CalledProcessError.returncode is the negativeGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)2016-06-031-1/+2
| | | | | | | | | | | | signal number when the process died due to a signal.
* | | Reindent properly.Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)2016-06-031-76/+74
| | |
* | | Issue #25931: Don't defining socketserver.Forking* names on platforms suchGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)2016-06-032-6/+14
| | | | | | | | | | | | as Windows that do not support os.fork().
* | | Merge: #26829: Clarify that namespace is copied to a new __dict__ in ↵R David Murray2016-06-033-2/+9
|\ \ \ | |/ / | | | | | | instance creation.
| * | #26829: Clarify that namespace is copied to a new __dict__ in instance creation.R David Murray2016-06-033-2/+9
| | | | | | | | | | | | Patch by Emily Morehouse.
* | | Merge: #27185: move test_pep292 into test_string.R David Murray2016-06-023-248/+241
|\ \ \ | |/ /
| * | #27185: move test_pep292 into test_string.R David Murray2016-06-023-248/+241
| |/ | | | | | | This makes the Template tests discoverable. Patch by Erin Braswell.
* | Issue #16192: Merge from 3.5Berker Peksag2016-06-021-3/+3
|\ \ | |/
| * Issue #16192: Fix copy and paste mistake noticed by Eryk SunBerker Peksag2016-06-021-3/+3
| |
* | issue27186 -- initial docs, tests, and python version of os.fspathEthan Furman2016-06-023-0/+51
| |
* | Merge 3.5 (asyncio)Yury Selivanov2016-06-022-3/+39
|\ \ | |/
| * asyncio: Fix getaddrinfo to accept service names (for port)Yury Selivanov2016-06-022-3/+39
| | | | | | | | Patch by A. Jesse Jiryu Davis
* | Merge 3.5 (asyncio)Yury Selivanov2016-06-022-1/+5
|\ \ | |/
| * asyncio: Support host=b'' for getaddrinfoYury Selivanov2016-06-022-1/+5
| |
* | Issue #21776: Merge from 3.5Berker Peksag2016-06-023-8/+40
|\ \ | |/
| * Issue #21776: distutils.upload now correctly handles HTTPErrorBerker Peksag2016-06-023-8/+40
| | | | | | | | Initial patch by Claudiu Popa.
* | Merge: #20973: add total ordering tests for ipaddressR David Murray2016-06-022-0/+34
|\ \ | |/
| * #20973: add total ordering tests for ipaddressR David Murray2016-06-022-0/+34
| | | | | | | | Patch by Tommy Beadle.
* | merge 3.5Benjamin Peterson2016-06-021-19/+2
|\ \ | |/
| * remove (hilarious) defaults for various constants getpath.c needsBenjamin Peterson2016-06-021-19/+2
| |
* | Merge: #13784: fix xml.sax.reader getColumn/LineNumber docs.R David Murray2016-06-021-2/+2
|\ \ | |/
| * #13784: fix xml.sax.reader getColumn/LineNumber docs.R David Murray2016-06-021-2/+2
| | | | | | | | verification and patch by Emily Morehouse.
* | Issue #16192: Merge from 3.5Berker Peksag2016-06-021-5/+4
|\ \ | |/
| * Issue #16192: Clarify when c_int is an alias to c_long in ctypes documentationBerker Peksag2016-06-021-5/+4
| |
* | merge 3.5Benjamin Peterson2016-06-021-3/+4
|\ \ | |/
| * note that Py_VISIT handles NULL (closes #27183)Benjamin Peterson2016-06-021-3/+4
| |
* | replace custom validation logic in the parse module with a simple DFA ↵Benjamin Peterson2016-06-022-2452/+96
| | | | | | | | | | | | validator (closes #26526) Patch from A. Skrobov.
* | Issue #23116: Merge from 3.5Berker Peksag2016-06-021-3/+3
|\ \ | |/
| * Issue #23116: Improve ask_ok() example in the Python tutorialBerker Peksag2016-06-021-3/+3
| |
* | Issue #21271: Adds new keyword only parameters in reset_mock callKushal Das2016-06-024-3/+36
| | | | | | | | | | We now have two keyword only parameters in the reset_mock function to selectively reset the return_value or the side_effects, or both.
* | Issue #27171: Fix typo in exception messageMartin Panter2016-06-021-1/+1
| |