Commit Graph

94447 Commits

Author SHA1 Message Date
Ned Deily 369826a879 final step in backout of bad default->3.5 merge d085b4f779af. merge 3.5 heads 2016-06-03 15:20:13 -07:00
Ned Deily 6371152154 first step in backout of bad default->3.5 merge d085b4f779af. Create new head and fix whitespace. 2016-06-03 15:17:13 -07:00
R David Murray f06324280a Merge: #22797: clarify when URLErrors are raised by urlopen. 2016-06-03 13:32:48 -04:00
R David Murray 21dcb932a7 #22797: clarify when URLErrors are raised by urlopen. 2016-06-03 13:29:17 -04:00
Serhiy Storchaka bb7f7327fe Null merge 2016-06-03 10:48:43 +03:00
Serhiy Storchaka 2e7cb1eda9 Merge heads 2016-06-03 10:48:13 +03:00
Serhiy Storchaka fde75ae020 Merge heads 2016-06-03 10:47:38 +03:00
Serhiy Storchaka a9e6edaf41 Merge 3.5. 2016-06-03 10:45:56 +03:00
Serhiy Storchaka 93ac7ae7d3 Merge heads 2016-06-03 10:44:12 +03:00
Serhiy Storchaka 10fd0aaf8b Issue #27185: Rename test_string_merged.py back to test_string.py. 2016-06-03 10:38:24 +03:00
Serhiy Storchaka 717ea08be3 Issue #27185: Merge test_pep292.py into test_string_merged.py. 2016-06-03 10:38:02 +03:00
Serhiy Storchaka 73e16135bf Issue #27185: Rename test_pep292.py to test_string_merged.py. 2016-06-03 10:32:36 +03:00
Serhiy Storchaka 9415bc41ab Issue #27185: Rename test_string.py to test_string_merged.py. 2016-06-03 10:30:25 +03:00
Senthil Kumaran 194a4a245a [merge from 3.5] - issue27113 - Document "check_same_thread" parameter in sqlite3.connect api.
Patch contributed by Dave Sawyer.
2016-06-03 00:04:28 -07:00
Senthil Kumaran 7ee91942b4 issue27113 - Document "check_same_thread" parameter in sqlite3.connect api.
Patch contributed by Dave Sawyer.
2016-06-03 00:03:48 -07:00
Senthil Kumaran 464afee749 [merge from 3.5] - issue8519 - Reference termios and ioctl manual pages in the library documentation. 2016-06-02 23:50:02 -07:00
Senthil Kumaran 0779129302 issue8519 - Reference termios and ioctl manual pages in the library documentation. 2016-06-02 23:49:05 -07:00
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) b414906f93 issue27167: make the test not care about the exact signal name in the
error message as some numbers map to multiple names.
2016-06-03 06:19:35 +00:00
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) d6da7604d3 Issue #27167: Clarify the subprocess.CalledProcessError error message text
when the child process died due to a signal.
2016-06-03 06:14:06 +00:00
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) 287e687648 issue25931: document that socketserver.Forking* are unavailable on platforms
lacking os.fork().
2016-06-03 05:44:47 +00:00
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) a945969d71 Issue25931: fix tests broken by the conditional define of socketserver.Forking* 2016-06-03 05:26:14 +00:00
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) aea1650389 typo fix 2016-06-03 00:57:26 +00:00
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) 3498db1f78 merge 3.5 2016-06-03 00:33:02 +00:00
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) 583a1d6240 Document that CalledProcessError.returncode is the negative
signal number when the process died due to a signal.
2016-06-03 00:31:21 +00:00
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) 1bb8109fe3 Reindent properly. 2016-06-03 00:16:02 +00:00
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) cef1f83c71 Issue #25931: Don't defining socketserver.Forking* names on platforms such
as Windows that do not support os.fork().
2016-06-03 00:13:36 +00:00
R David Murray 3bad04ca62 Merge: #26829: Clarify that namespace is copied to a new __dict__ in instance creation. 2016-06-02 20:06:13 -04:00
R David Murray dd4fcf52f4 #26829: Clarify that namespace is copied to a new __dict__ in instance creation.
Patch by Emily Morehouse.
2016-06-02 20:05:43 -04:00
R David Murray 1b50c4d697 Merge: #27185: move test_pep292 into test_string. 2016-06-02 19:38:20 -04:00
R David Murray a32c738ad7 #27185: move test_pep292 into test_string.
This makes the Template tests discoverable.  Patch by Erin Braswell.
2016-06-02 19:37:47 -04:00
Berker Peksag ca4589e932 Issue #16192: Merge from 3.5 2016-06-02 15:28:29 -07:00
Berker Peksag 8891dfe717 Issue #16192: Fix copy and paste mistake noticed by Eryk Sun 2016-06-02 15:28:00 -07:00
Ethan Furman cdc0879d3a issue27186 -- initial docs, tests, and python version of os.fspath 2016-06-02 15:06:09 -07:00
Yury Selivanov 1f56e5f6af Merge 3.5 (asyncio) 2016-06-02 16:51:27 -04:00
Yury Selivanov a714616d36 asyncio: Fix getaddrinfo to accept service names (for port)
Patch by A. Jesse Jiryu Davis
2016-06-02 16:51:07 -04:00
Yury Selivanov 642afb3d3d Merge 3.5 (asyncio) 2016-06-02 16:44:10 -04:00
Berker Peksag fddf12198f Issue #21776: Merge from 3.5 2016-06-02 13:47:23 -07:00
Berker Peksag 6a8e626a60 Issue #21776: distutils.upload now correctly handles HTTPError
Initial patch by Claudiu Popa.
2016-06-02 13:45:53 -07:00
Yury Selivanov a8f895f051 asyncio: Support host=b'' for getaddrinfo 2016-06-02 16:43:52 -04:00
R David Murray 0d20189f63 Merge: #20973: add total ordering tests for ipaddress 2016-06-02 15:49:41 -04:00
R David Murray 947ff38725 #20973: add total ordering tests for ipaddress
Patch by Tommy Beadle.
2016-06-02 15:46:04 -04:00
Benjamin Peterson 59ae8ec75f merge 3.5 2016-06-02 12:42:40 -07:00
Benjamin Peterson f585414813 remove (hilarious) defaults for various constants getpath.c needs 2016-06-02 12:41:35 -07:00
R David Murray e747dd89b6 Merge: #13784: fix xml.sax.reader getColumn/LineNumber docs. 2016-06-02 15:15:12 -04:00
Berker Peksag d612920484 Issue #16192: Merge from 3.5 2016-06-02 12:18:21 -07:00
Berker Peksag d85a1e6b55 Issue #16192: Clarify when c_int is an alias to c_long in ctypes documentation 2016-06-02 12:17:51 -07:00
R David Murray f86959d883 #13784: fix xml.sax.reader getColumn/LineNumber docs.
verification and patch by Emily Morehouse.
2016-06-02 15:14:30 -04:00
Benjamin Peterson 010bb99432 merge 3.5 2016-06-02 11:36:16 -07:00
Benjamin Peterson a49ccf2113 note that Py_VISIT handles NULL (closes #27183) 2016-06-02 11:35:59 -07:00
Berker Peksag 0a5120e457 Issue #23116: Improve ask_ok() example in the Python tutorial 2016-06-02 11:31:19 -07:00