Brett Cannon
43dab4bfcf
Merge 'used with permission' additions
2016-01-15 09:54:16 -08:00
Brett Cannon
07b954d148
Add some "used with permission" mentions where external resources are referenced.
...
Permission was validated prior to adding these markings.
2016-01-15 09:53:51 -08:00
Martin Panter
4edc0e8407
Issue #25940 : Merge ETIMEDOUT fix from 3.5
2016-01-15 02:37:21 +00:00
Martin Panter
a8b43b5fc3
Issue #25940 : Merge ETIMEDOUT fix from 3.4 into 3.5
2016-01-15 02:28:59 +00:00
Martin Panter
3f2240ccb6
Issue #25940 : Merge ETIMEDOUT fix from 3.3 into 3.4
2016-01-15 02:18:31 +00:00
Martin Panter
fab75d9bb9
Issue #25940 : Merge ETIMEDOUT fix from 3.2 into 3.3
2016-01-15 02:08:13 +00:00
Martin Panter
035583b389
Issue #25940 : On Windows, connecting to port 444 returns ETIMEDOUT
2016-01-15 01:16:41 +00:00
Martin Panter
8df9848322
Issue #25940 : test_ssl is working again
2016-01-14 13:26:43 +00:00
Martin Panter
3570e02fd2
Issue #25940 : Merge self-signed.pythontest.net testing from 3.5
2016-01-14 13:25:06 +00:00
Martin Panter
40b97ec57a
Issue #25940 : Update new SSL tests for self-signed.pythontest.net
...
Removed SSL_ERROR_SYSCALL checking from ssl_io_loop() so that the loop can
terminate when unwrap() raises that error.
2016-01-14 13:05:46 +00:00
Martin Panter
17cbee49d6
Issue #25940 : Merge self-signed.pythontest.net testing from 3.4 into 3.5
2016-01-14 13:22:29 +00:00
Martin Panter
b55f8b79af
Issue #25940 : Update new SSL tests for self-signed.pythontest.net
2016-01-14 12:53:56 +00:00
Martin Panter
514bb0711f
Issue #25940 : Merge self-signed.pythontest.net testing from 3.3 into 3.4
2016-01-14 12:46:49 +00:00
Martin Panter
73f55076f6
Issue #25940 : Merge self-signed.pythontest.net testing from 3.2 into 3.3
2016-01-14 12:21:02 +00:00
Martin Panter
3d81d93f34
Issue #25940 : Use self-signed.pythontest.net in SSL tests
...
This is instead of svn.python.org, whose certificate recently expired, and
whose new certificate uses a different root certificate.
The certificate used at the pythontest server was modifed to set the "basic
constraints" CA flag. This flag seems to be required for test_get_ca_certs_
capath() to work (in Python 3.4+).
Added the new self-signed certificate to capath with the following commands:
cp Lib/test/{selfsigned_pythontestdotnet.pem,capath/}
c_rehash -v Lib/test/capath/
c_rehash -v -old Lib/test/capath/
# Note the generated file names
cp Lib/test/capath/{selfsigned_pythontestdotnet.pem,0e4015b9.0}
mv Lib/test/capath/{selfsigned_pythontestdotnet.pem,ce7b8643.0}
The new server responds with "No route to host" when connecting to port 444.
2016-01-14 09:36:00 +00:00
Senthil Kumaran
86f7109dad
Issue #25822 : Add docstrings to the fields of urllib.parse results.
...
Patch contributed by Swati Jaiswal.
2016-01-14 00:11:39 -08:00
Senthil Kumaran
436831dbe4
Issue22642 - Convert trace module's option handling mechanism from getopt to argparse.
...
Patch contributed by SilentGhost.
2016-01-13 07:46:54 -08:00
Senthil Kumaran
121edbf7e2
Issue25347 - Format the error message output of mock's assert_has_calls method.
...
Patch contributed by Robert Zimmerman.
2016-01-12 06:18:32 -08:00
Barry Warsaw
e973620472
Merge heads.
2016-01-11 15:53:19 -05:00
doko@ubuntu.com
0633cb7d7a
Merge 3.5
2016-01-11 21:43:29 +01:00
doko@ubuntu.com
b2b1217270
- Issue #24705 : Fix sysconfig._parse_makefile not expanding ${} vars
...
appearing before $() vars.
2016-01-11 21:41:40 +01:00
Yury Selivanov
37dc2b2883
Issue #25486 : Resurrect inspect.getargspec in 3.6. Backout a565aad5d6e1.
...
The decision is that we shouldn't remove popular APIs (however long they
are depreacted) from Python 3, while 2.7 is still around and supported.
2016-01-11 15:15:01 -05:00
Barry Warsaw
09880c89e9
Comment out some tests that won't pass now that we've reverted the
...
picklability regression. Also, as per further discussion, remove the
regressing code.
2016-01-11 15:14:53 -05:00
Yury Selivanov
4f8273d77e
Merge 3.5 (issue #26050 )
2016-01-11 12:32:53 -05:00
Yury Selivanov
b4b8a0ef3e
Merge 3.4 (Issue #26050 )
2016-01-11 12:30:56 -05:00
Yury Selivanov
d9d0e864b9
Issue #26050 : Add asyncio.StreamReader.readuntil() method.
...
Patch by Марк Коренберг.
2016-01-11 12:28:19 -05:00
Senthil Kumaran
96b531abd5
Issue #26069 : Remove the deprecated apis in the trace module.
2016-01-11 07:09:42 -08:00
Andrew Svetlov
511bf7880c
merge 3.5
2016-01-11 12:26:02 +02:00
Andrew Svetlov
4ea31f5b86
merge 3.4
2016-01-11 12:25:40 +02:00
Andrew Svetlov
9d976fa75f
Sync with asyncio
2016-01-11 12:25:23 +02:00
Andrew Svetlov
34dd59ec84
merge 3.5
2016-01-11 09:13:10 +02:00
Andrew Svetlov
b86abb79aa
merge 3.4
2016-01-11 09:09:10 +02:00
Andrew Svetlov
c07b16b40f
Sync with asyncio repo
2016-01-11 08:42:49 +02:00
Ezio Melotti
ef7851b891
#24789 : merge with 3.5.
2016-01-09 16:09:19 +02:00
Ezio Melotti
ee2a392e6a
#24789 : fix docstring of ctypes.create_string_buffer. Patch by Matheus Vieira Portela.
2016-01-09 16:08:24 +02:00
Senthil Kumaran
b94591c2bf
merge from 3.5
...
Issue #22138 : Fix mock.patch behavior when patching descriptors. Restore
original values after patching.
Patch contributed by Sean McCully.
2016-01-08 23:44:10 -08:00
Senthil Kumaran
81bc927da7
Issue #22138 : Fix mock.patch behavior when patching descriptors. Restore
...
original values after patching.
Patch contributed by Sean McCully.
2016-01-08 23:43:29 -08:00
Guido van Rossum
2900995edd
Hopeful fix for test_rglob_common on Windows without symlinks. (Merge 3.5->3.6)
2016-01-07 13:13:31 -08:00
Guido van Rossum
03abf6dd98
Hopeful fix for test_rglob_common on Windows without symlinks. (Merge 3.4->3.5)
2016-01-07 13:13:04 -08:00
Guido van Rossum
9c39b67ca5
Hopeful fix for test_rglob_common on Windows without symlinks.
2016-01-07 13:12:34 -08:00
Guido van Rossum
8355bd7f66
Add another try/except PermissionError to avoid depending on listdir order. Fix issues #24120 and #26012 . (Merge 3.5->3.6)
2016-01-07 10:58:20 -08:00
Guido van Rossum
c3a8272705
Add another try/except PermissionError to avoid depending on listdir order. Fix issues #24120 and #26012 . (Merge 3.4->3.5)
2016-01-07 10:57:37 -08:00
Guido van Rossum
bc9fddaf50
Add another try/except PermissionError to avoid depending on listdir order. Fix issues #24120 and #26012 .
2016-01-07 10:56:36 -08:00
Berker Peksag
bd15bae45a
Fix typo in docstring of multiprocessing.spawn.spawn_main()
2016-01-07 19:03:15 +02:00
Berker Peksag
16fb674882
Fix typo in docstring of multiprocessing.spawn.spawn_main()
2016-01-07 19:02:55 +02:00
Guido van Rossum
483397a235
Issue #22570 : Add 'path' attribute to pathlib.Path objects. (Merge 3.5->3.6)
2016-01-06 11:03:47 -08:00
Guido van Rossum
1a4afec0d6
Issue #22570 : Add 'path' attribute to pathlib.Path objects. (Merge 3.4->3.5)
2016-01-06 11:03:15 -08:00
Guido van Rossum
e428231539
Issue #22570 : Add 'path' attribute to pathlib.Path objects.
2016-01-06 11:01:42 -08:00
Guido van Rossum
e630b6818f
Issue #26012 : Don't traverse into symlinks for ** pattern in pathlib.Path.[r]glob(). (Merge 3.5->3.6)
2016-01-06 10:36:19 -08:00
Guido van Rossum
520f297eb4
Issue #26012 : Don't traverse into symlinks for ** pattern in pathlib.Path.[r]glob(). (Merge 3.4->3.5)
2016-01-06 10:35:30 -08:00
