summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge with 3.4Georg Brandl2014-03-2410-14/+20
|\
| * Fix a few scoping issues with versionadded/versionchanged directives.Georg Brandl2014-03-2412-32/+38
| |
* | Use deprecated-removed directive, clean up a few markup issues aroundGeorg Brandl2014-03-246-23/+23
| | | | | | | | deprecated directives.
* | Merge with 3.4Zachary Ware2014-03-241-1/+1
|\ \ | |/
| * Remove superfluous open parenthesis. Noticed by cocoatomo on docs@.Zachary Ware2014-03-241-1/+1
| |
* | Merge the patch for issue #21013 into defaultDonald Stufft2014-03-234-16/+70
|\ \ | |/
| * Issue #21013: Enhance ssl.create_default_context() for server side contextsDonald Stufft2014-03-234-16/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #21013 by modfying ssl.create_default_context() to: * Move the restricted ciphers to only apply when using ssl.Purpose.CLIENT_AUTH. The major difference between restricted and not is the lack of RC4 in the restricted. However there are servers that exist that only expose RC4 still. * Switches the default protocol to ssl.PROTOCOL_SSLv23 so that the context will select TLS1.1 or TLS1.2 if it is available. * Add ssl.OP_NO_SSLv3 by default to continue to block SSL3.0 sockets * Add ssl.OP_SINGLE_DH_USE and ssl.OP_SINGLE_ECDG_USE to improve the security of the perfect forward secrecy * Add ssl.OP_CIPHER_SERVER_PREFERENCE so that when used for a server side socket the context will prioritize our ciphers which have been carefully selected to maximize security and performance. * Documents the failure conditions when a SSL3.0 connection is required so that end users can more easily determine if they need to unset ssl.OP_NO_SSLv3.
* | merge with 3.4Georg Brandl2014-03-231-1/+1
|\ \ | |/
| * tutorial: no "linux2" sys.platform on 3.x (thanks Arfrever)Georg Brandl2014-03-231-1/+1
| |
* | Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas ↵Antoine Pitrou2014-03-233-0/+7
|\ \ | |/ | | | | Schwab.
| * Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas ↵Antoine Pitrou2014-03-233-0/+7
| | | | | | | | Schwab.
* | #20145: assert[Raises|Warns]Regex now raise TypeError on bad regex.R David Murray2014-03-235-1/+23
| | | | | | | | | | | | | | Previously a non-string, non-regex second argument could cause the test to always pass. Initial patch by Kamilla Holanda.
* | Merge 3.4.Richard Oudkerk2014-03-231-2/+2
|\ \ | |/
| * Issue #20990: Correction for 619331c67638.Richard Oudkerk2014-03-231-2/+2
| |
* | Merge #20976: remove unneeded quopri import in email.utils.R David Murray2014-03-232-4/+2
|\ \ | |/
| * #20976: remove unneeded quopri import in email.utils.R David Murray2014-03-232-4/+2
| |
* | Issue #20913: make it clear that create_default_context() also enables ↵Antoine Pitrou2014-03-231-4/+5
|\ \ | |/ | | | | hostname checking
| * Issue #20913: make it clear that create_default_context() also enables ↵Antoine Pitrou2014-03-231-4/+5
| | | | | | | | hostname checking
* | Merge 3.4.Richard Oudkerk2014-03-233-2/+4
|\ \ | |/
| * Merge 3.3.Richard Oudkerk2014-03-233-2/+4
| |\
| | * Issue #20633: Replace relative import by absolute import.Richard Oudkerk2014-03-232-1/+3
| | |
* | | Merge 3.4.Richard Oudkerk2014-03-234-6/+30
|\ \ \ | |/ /
| * | Issue #20980: Stop wrapping exception when using ThreadPool.Richard Oudkerk2014-03-234-6/+30
| | |
* | | Merge 3.4.Richard Oudkerk2014-03-233-5/+16
|\ \ \ | |/ /
| * | Issue #20990: Fix issues found by pyflakes for multiprocessing.Richard Oudkerk2014-03-233-5/+16
| | |
* | | merge with 3.4Georg Brandl2014-03-221-2/+2
|\ \ \ | |/ /
| * | Closes #20975: make date in the interpreter banner a little more consistentGeorg Brandl2014-03-221-2/+2
| | |
* | | Issue #20913: improve the SSL security considerations to first advocate ↵Antoine Pitrou2014-03-228-103/+135
|\ \ \ | |/ / | | | | | | using create_default_context().
| * | Issue #20913: improve the SSL security considerations to first advocate ↵Antoine Pitrou2014-03-228-103/+135
| | | | | | | | | | | | using create_default_context().
* | | Issue #21015: SSL contexts will now automatically select an elliptic curve ↵Antoine Pitrou2014-03-223-0/+31
|\ \ \ | |/ / | | | | | | | | | | | | for ECDH key exchange on OpenSSL 1.0.2 and later, and otherwise default to "prime256v1". (should also fix a buildbot failure introduced by #20995)
| * | Issue #21015: SSL contexts will now automatically select an elliptic curve ↵Antoine Pitrou2014-03-223-0/+31
| | | | | | | | | | | | | | | | | | for ECDH key exchange on OpenSSL 1.0.2 and later, and otherwise default to "prime256v1". (should also fix a buildbot failure introduced by #20995)
* | | Issue #21017: Enable Tix debug build on WindowsZachary Ware2014-03-223-2/+4
| | |
* | | Issue #15968: Temporarily revert change to PCbuild/rt.batZachary Ware2014-03-221-1/+3
| | | | | | | | | | | | | | | to prevent buildbot failures on test_idle. This change should go back in once #20035 is fixed.
* | | improve the command-line interface of json.tool (closes #21000)Benjamin Peterson2014-03-224-12/+76
| | | | | | | | | | | | A patch from Berker Peksag.
* | | Issue #15968: Incorporated Tcl, Tk, and Tix builds into the Windows buildZachary Ware2014-03-2218-206/+680
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | solution. Currently, Tix is not built in Debug configuration. This change also: - simplifies some Tcl/Tk-related msbuild properties for _tkinter - copies the Tcl and Tk DLLs into the build output directory, meaning they will always be available after a build without having to copy them manually or change PATH - removes PCbuild/build_tkinter.py: the solution does the build without needing to invoke Python (so Tcl/Tk/Tix can be built in parallel with the rest of the build using the `/m` msbuild command line switch) - removes an outdated README concerning building Tcl/Tk on AMD64
* | | Fix an incomplete merge of Misc/NEWSDonald Stufft2014-03-221-3/+2
| | |
* | | Merge changes from 3.4 to bring in fixes for Issue #20995Donald Stufft2014-03-223-19/+41
|\ \ \ | |/ /
| * | Issue #20995: Enhance default ciphers used by the ssl moduleDonald Stufft2014-03-223-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #20995 by Enabling better security by prioritizing ciphers such that: * Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE) * Prefer ECDHE over DHE for better performance * Prefer any AES-GCM over any AES-CBC for better performance and security * Then Use HIGH cipher suites as a fallback * Then Use 3DES as fallback which is secure but slow * Finally use RC4 as a fallback which is problematic but needed for compatibility some times. * Disable NULL authentication, NULL encryption, and MD5 MACs for security reasons
* | | (Merge 3.4) Close #21010: Fix typo in asyncio doc. Patch written by ClaudiuVictor Stinner2014-03-211-1/+1
|\ \ \ | |/ / | | | | | | Popa.
| * | Close #21010: Fix typo in asyncio doc. Patch written by Claudiu Popa.Victor Stinner2014-03-211-1/+1
| | |
* | | Null merge (I transplated 2 commits from default to 3.4)Victor Stinner2014-03-210-0/+0
|\ \ \ | |/ /
| * | Issue #21006: Fix subprocess example on Windows in asyncio docVictor Stinner2014-03-211-1/+6
| | |
| * | Close #21005: Fix documentation of asyncio.subprocess.DEVNULLVictor Stinner2014-03-211-4/+3
| | |
* | | Issue #20627: xmlrpc.client.ServerProxy is now a context manager.Brett Cannon2014-03-215-10/+42
| | | | | | | | | | | | Patch by Claudiu Popa.
* | | mergeBrett Cannon2014-03-210-0/+0
|\ \ \ | |/ /
| * | mergeBrett Cannon2014-03-219-79/+60
| |\ \
* | \ \ Merge for issue #20884Brett Cannon2014-03-211-1/+6
|\ \ \ \ | |/ / /
| * | | Issue #20884: Don't assume in importlib.__init__ that __file__ isBrett Cannon2014-03-212-1/+8
| | | | | | | | | | | | | | | | defined.
* | | | Issue #19165: The formatter module graduates to full deprecation.Brett Cannon2014-03-213-2/+6
| | | |
* | | | Issue19995: more informative error message; spelling corrections; use ↵Ethan Furman2014-03-212-14/+30
| | | | | | | | | | | | | | | | operator.mod instead of __mod__