summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* branch mergeEthan Furman2016-01-153-5/+26
|\
| * revert change 87a9dff5106c: pure Enum members again evaluate to True;Ethan Furman2016-01-153-5/+26
| | | | | | | | | | update Finer Points section of docs to cover boolean evaluation; add more tests for pure and mixed boolean evaluation
* | Issue #25791: Raise an ImportWarning when __spec__ or __package__ areBrett Cannon2016-01-157-310/+376
|/ | | | | | | | not defined for a relative import. This is the start of work to try and clean up import semantics to rely more on a module's spec than on the myriad attributes that get set on a module. Thanks to Rose Ames for the patch.
* Merge for issue #17633Brett Cannon2016-01-152-48/+248
|\
| * Issue #17633: Improve support for namespace packages with zipimport.Brett Cannon2016-01-153-48/+250
| | | | | | | | | | | | | | | | | | Previously zipimport mistakenly limited namespace support to only the top-level of the zipfile when it should have supported an arbitrary depth. Thanks to Phil Connel for the bug report and initial patch and Mike Romberg for the final patch.
* | Merge 'used with permission' additionsBrett Cannon2016-01-153-1/+4
|\ \ | |/
| * Add some "used with permission" mentions where external resources are ↵Brett Cannon2016-01-153-1/+4
| | | | | | | | | | | | referenced. Permission was validated prior to adding these markings.
* | Merge for issue #26114Brett Cannon2016-01-151-3/+2
|\ \ | |/
| * Issue #26114: Remove a reference to 'Numerical Recipes'.Brett Cannon2016-01-151-3/+2
| | | | | | | | | | | | While no copyright violation occurred, the license which 'Numerical Recipes' operates under is not amenable to Python, so to prevent confusion it's easier to simply remove its mention.
* | Issue #25940: Merge ETIMEDOUT fix from 3.5Martin Panter2016-01-151-1/+1
|\ \ | |/
| * Issue #25940: Merge ETIMEDOUT fix from 3.4 into 3.5Martin Panter2016-01-151-1/+1
| |\
| | * Issue #25940: Merge ETIMEDOUT fix from 3.3 into 3.4Martin Panter2016-01-151-1/+1
| | |\
| | | * Issue #25940: Merge ETIMEDOUT fix from 3.2 into 3.3Martin Panter2016-01-151-1/+1
| | | |\
| | | | * Issue #25940: On Windows, connecting to port 444 returns ETIMEDOUTMartin Panter2016-01-151-1/+3
| | | | |
* | | | | Issue #25940: test_ssl is working againMartin Panter2016-01-141-2/+0
| | | | |
* | | | | Issue #25940: Merge self-signed.pythontest.net testing from 3.5Martin Panter2016-01-146-111/+111
|\ \ \ \ \ | |/ / / /
| * | | | Issue #25940: Update new SSL tests for self-signed.pythontest.netMartin Panter2016-01-141-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Removed SSL_ERROR_SYSCALL checking from ssl_io_loop() so that the loop can terminate when unwrap() raises that error.
| * | | | Issue #25940: Merge self-signed.pythontest.net testing from 3.4 into 3.5Martin Panter2016-01-146-98/+97
| |\ \ \ \ | | |/ / /
| | * | | Issue #25940: Update new SSL tests for self-signed.pythontest.netMartin Panter2016-01-141-12/+12
| | | | |
| | * | | Issue #25940: Merge self-signed.pythontest.net testing from 3.3 into 3.4Martin Panter2016-01-146-86/+88
| | |\ \ \ | | | |/ /
| | | * | Issue #25940: Merge self-signed.pythontest.net testing from 3.2 into 3.3Martin Panter2016-01-147-89/+111
| | | |\ \ | | | | |/
| | | | * Issue #25940: Use self-signed.pythontest.net in SSL testsMartin Panter2016-01-146-96/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | * Issue #25940: Backport self-signed.pythontest.net testing for test_httplibGeorg Brandl2014-11-052-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | The svn.python.org server recently changed root certificate, causing the test to fail. This backports revision 4985375db40f.
* | | | | - merge 3.5doko@ubuntu.com2016-01-141-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | dictobject.c(dict_sizeof): Make it static again.doko@ubuntu.com2016-01-141-1/+1
| | | | |
* | | | | Issue #25822: Add docstrings to the fields of urllib.parse results.Senthil Kumaran2016-01-142-2/+68
| | | | | | | | | | | | | | | | | | | | Patch contributed by Swati Jaiswal.
* | | | | Add a NEWS entry for Issue #22642.Senthil Kumaran2016-01-131-0/+3
| | | | |
* | | | | Issue22642 - Convert trace module's option handling mechanism from getopt to ↵Senthil Kumaran2016-01-132-205/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | argparse. Patch contributed by SilentGhost.
* | | | | Issue25347 - Format the error message output of mock's assert_has_calls method.Senthil Kumaran2016-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | Patch contributed by Robert Zimmerman.
* | | | | #26001: merge with 3.5.Ezio Melotti2016-01-121-7/+8
|\ \ \ \ \ | |/ / / /
| * | | | #26001: mention in the tutorial that files in binary mode expect bytes, not str.Ezio Melotti2016-01-121-7/+8
| | | | |
* | | | | #19006: merge with 3.5.Ezio Melotti2016-01-121-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | #19006: fix wording in unittest docs.Ezio Melotti2016-01-121-3/+4
| | | | |
* | | | | Closes #25348: Merge with 3.5Zachary Ware2016-01-123-53/+56
|\ \ \ \ \ | |/ / / /
| * | | | Issue #25348: Add --pgo and --pgo-job flags to PCbuild\build.batZachary Ware2016-01-123-51/+61
| | | | |
* | | | | Merge 3.5 (issue #25486)Yury Selivanov2016-01-121-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Issue #25486: Drop "removed in 3.6" wording from inspect.getargspec docs.Yury Selivanov2016-01-121-2/+1
| | | | |
* | | | | #25517: merge with 3.5.Ezio Melotti2016-01-111-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | #25517: fix regex in the regex howto. Patch by Elena Oat.Ezio Melotti2016-01-111-3/+4
| | | | |
* | | | | #25991: merge with 3.5.Ezio Melotti2016-01-111-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | #25991: fix readline example to limit history size. Patch by Daniel Dye.Ezio Melotti2016-01-111-0/+4
| | | | |
| * | | | Merge heads.Barry Warsaw2016-01-112-37/+11
| |\ \ \ \
* | \ \ \ \ Merge heads.Barry Warsaw2016-01-112-12/+0
|\ \ \ \ \ \
| * \ \ \ \ \ As per further discussion, re-enable the typeobject.c guard for picklability.Barry Warsaw2016-01-112-12/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | upstreams such as Cython will have to adjust.
| | * | | | | Comment out some tests that won't pass now that we've reverted theBarry Warsaw2016-01-112-37/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | picklability regression. Also, as per further discussion, remove the regressing code.
* | | | | | | Merge 3.5doko@ubuntu.com2016-01-112-1/+9
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | - Issue #24705: Fix sysconfig._parse_makefile not expanding ${} varsdoko@ubuntu.com2016-01-112-1/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | appearing before $() vars.
* | | | | | Issue #25486: Resurrect inspect.getargspec in 3.6. Backout a565aad5d6e1.Yury Selivanov2016-01-115-10/+79
| |/ / / / |/| | | | | | | | | | | | | | | | | | | 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.
* | | | | Issue #22995: [UPDATE] Comment out the one of the pickleability tests inBarry Warsaw2016-01-112-0/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | _PyObject_GetState() due to regressions observed in Cython-based projects.
| * | | | Issue #22995: [UPDATE] Comment out the one of the pickleability tests inBarry Warsaw2016-01-112-0/+12
| | | | | | | | | | | | | | | | | | | | _PyObject_GetState() due to regressions observed in Cython-based projects.