summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* check local class namespace before reaching for cells (closes #17853)Benjamin Peterson2013-04-3010-122/+187
|
* #17881: merge with 3.3.Ezio Melotti2013-04-301-3/+3
|\
| * #17881: clarify documentation of plistlib.Ezio Melotti2013-04-301-3/+3
| |
* | merge (no news entry needed for this fix to an earlier 3.4 blunderGregory P. Smith2013-04-300-0/+0
|\ \ | |/ | | | | that already contains the right news)
| * fix the news entry, the description in 3.3 should be differentGregory P. Smith2013-04-301-3/+3
| | | | | | | | than the one merged from 3.2 to match the actual changes here.
* | mergeGregory P. Smith2013-04-300-0/+0
|\ \ | |/
| * news entryGregory P. Smith2013-04-301-0/+4
| |\
| | * news entryGregory P. Smith2013-04-301-0/+4
| | |
* | | null mergeGregory P. Smith2013-04-300-0/+0
|\ \ \ | |/ /
| * | null mergeGregory P. Smith2013-04-300-0/+0
| |\ \ | | |/
| | * This local change was lost during the fixing of issue17192 to updateGregory P. Smith2013-04-301-0/+5
| | | | | | | | | | | | | | | | | | | | | libffi to 3.0.13. (i'm not sure if it is needed anymore but see issue 10309 for details which makes no mention of upstream; this change is already in 3.3 and 3.4 but may need reapplying to 2.7 as done here)
* | | * Fix remaining bits of issue 17192 for 3.4 - these changesGregory P. Smith2013-04-3016-231/+418
|\ \ \ | |/ / | | | | | | | | | were missing from a messed up merge during the libffi 3.0.13 import. the diffs from upstream libffi 3.0.13 are now small.
| * | * Fix remaining bits of issue 17192 for 3.3 - these changesGregory P. Smith2013-04-3016-231/+418
| | | | | | | | | | | | | | | were missing from a messed up merge during the libffi 3.0.13 import. the diffs from upstream libffi 3.0.13 are now small.
* | | * Fix PART of issue 17192 for 3.4 - reapply the issue11729 patchGregory P. Smith2013-04-303-33/+58
|\ \ \ | |/ / | | | | | | | | | | | | that was undone in the merge fun from upstream which already had it in 3.0.13. * Add the missing update to libffi.info.
| * | * Fix PART of issue 17192 for 3.3 - reapply the issue11729 patchGregory P. Smith2013-04-303-33/+58
| |\ \ | | |/ | | | | | | | | | | | | that was undone in the merge fun from upstream which already had it in 3.0.13. * Add the missing update to libffi.info.
| | * * Fix issue 17192 for 3.2 - reapply the issue11729 patch that was undoneGregory P. Smith2013-04-303-33/+58
| | | | | | | | | | | | | | | in the merge fun from upstream which already had it in 3.0.13. * Add the missing update to libffi.info.
* | | refactor traceback.py to reduce code duplication (closes #17646)Benjamin Peterson2013-04-292-143/+132
| | | | | | | | | | | | Patch by Martin Morrison.
* | | merge 3.3 (#17863)Benjamin Peterson2013-04-292-9/+11
|\ \ \ | |/ /
| * | ignore errors when trying to fetch sys.stdin.encoding (closes #17863)Benjamin Peterson2013-04-292-9/+11
| | |
* | | merge 3.3Benjamin Peterson2013-04-293-1/+11
|\ \ \ | |/ /
| * | raise an ImportError (rather than fatal) when __import__ is not found in ↵Benjamin Peterson2013-04-293-1/+11
| | | | | | | | | | | | __builtins__ (closes #17867)
* | | Null merge, DataHandler exists in 3.4.R David Murray2013-04-280-0/+0
|\ \ \ | |/ /
| * | #7152: Remove incorrectly added reference to DataHandler.R David Murray2013-04-281-1/+1
| | |
* | | merge for issue #17358Brett Cannon2013-04-282-2/+15
|\ \ \ | |/ /
| * | Issue #17358: imp.load_source() and load_compiled() should now returnBrett Cannon2013-04-282-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modules which will typically work when reloaded. A hack is used to support these functions as their API allowed them to pass in a file object but then operate as if import had loaded them. Unfortunately the hack kept a reference around for the file object passed in which would be unusable on reload since it had been closed. The solution is to simply use the hack for the initial load but then a proper loader on the module so that imp.reload() at least has a chance to work.
* | | Merge: Reflow paragraphs.R David Murray2013-04-282-14/+13
|\ \ \ | |/ / | | | | | | | | | (I got a merge conflict on this in urllib.request.rst, which makes no sense to me. Hopefully I didn't screw up the previous 3.3 commit.)
| * | Reflow paragraphs.R David Murray2013-04-282-14/+13
| | | | | | | | | | | | | | | I know one of them looks worse, but now it is <80 chars and matches the 2.7 text.
* | | Merge #7152: Clarify that ProxyHandler is added only if proxy settings are ↵R David Murray2013-04-283-9/+15
|\ \ \ | |/ / | | | | | | | | | | | | detected. Behavior confirmation and initial patch by Jessica McKellar.
| * | #7152: Clarify that ProxyHandler is added only if proxy settings are detected.R David Murray2013-04-283-9/+15
| | | | | | | | | | | | Behavior confirmation and initial patch by Jessica McKellar.
* | | Added base64 module tests for non-binary files.Serhiy Storchaka2013-04-281-2/+10
|\ \ \ | |/ /
| * | Added base64 module tests for non-binary files.Serhiy Storchaka2013-04-281-2/+10
| | |
* | | Issue #17842. Added base64 module tests with bytearray arguments.Serhiy Storchaka2013-04-281-1/+26
|\ \ \ | |/ / | | | | | | Original patch by Kushal Das.
| * | Issue #17842. Added base64 module tests with bytearray arguments.Serhiy Storchaka2013-04-281-1/+26
| | | | | | | | | | | | Original patch by Kushal Das.
* | | Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,Serhiy Storchaka2013-04-284-7/+10
|\ \ \ | |/ / | | | | | | such as was shipped with Centos 5 and Mac OS X 10.4.
| * | Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,Serhiy Storchaka2013-04-284-7/+10
| | | | | | | | | | | | such as was shipped with Centos 5 and Mac OS X 10.4.
* | | merge for issue #17357Brett Cannon2013-04-281-5/+5
|\ \ \ | |/ /
| * | Issue #17357: Use more stern wording forBrett Cannon2013-04-281-5/+5
| | | | | | | | | | | | importlib.invalidate_caches().
* | | Issue #17804: New function ``struct.iter_unpack`` allows for streaming ↵Antoine Pitrou2013-04-265-1/+262
| | | | | | | | | | | | struct unpacking.
* | | merge headsGiampaolo Rodola'2013-04-266-45/+93
|\ \ \
| * | | 17830: preserve line endings of original file when updating keywords.R David Murray2013-04-253-38/+45
| | | | | | | | | | | | | | | | | | | | This fixes the test failures on Windows from the new tests, and includes test fixes as well as the module fix.
| * | | Issue #17272: Making the urllib.request's Request.full_url a descriptor. FixesSenthil Kumaran2013-04-254-7/+48
| | | | | | | | | | | | | | | | bugs with assignment to full_url. Patch by Demian Brecht.
* | | | ftplib: update connect() docstring by mentioning 'timeout' argumentGiampaolo Rodola'2013-04-261-0/+1
|/ / /
* | | Issue #17835: Fix test_io when the default OS pipe buffer size is larger ↵Antoine Pitrou2013-04-243-6/+11
|\ \ \ | |/ / | | | | | | than one million bytes.
| * | Issue #17835: Fix test_io when the default OS pipe buffer size is larger ↵Antoine Pitrou2013-04-243-6/+11
| | | | | | | | | | | | than one million bytes.
* | | Issue #17244: Windows doesn't let you set permissions on directories.Brett Cannon2013-04-241-0/+2
| | |
* | | Issue #17832: fix a compilation warning about a function prototype.Antoine Pitrou2013-04-241-1/+2
| | | | | | | | | | | | Also, make the private function static.
* | | Revert c9674421d78e, leaving an additional commentEli Bendersky2013-04-241-5/+10
| | |
* | | clean the environment from pre-existing PYTHONWARNINGS for test_warningsŁukasz Langa2013-04-231-0/+12
|\ \ \ | |/ /
| * | clean the environment from pre-existing PYTHONWARNINGS for test_warningsŁukasz Langa2013-04-231-0/+12
| | |
* | | null mergeŁukasz Langa2013-04-230-0/+0
|\ \ \ | |/ /