Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | check local class namespace before reaching for cells (closes #17853) | Benjamin Peterson | 2013-04-30 | 10 | -122/+187 |
| | |||||
* | #17881: merge with 3.3. | Ezio Melotti | 2013-04-30 | 1 | -3/+3 |
|\ | |||||
| * | #17881: clarify documentation of plistlib. | Ezio Melotti | 2013-04-30 | 1 | -3/+3 |
| | | |||||
* | | merge (no news entry needed for this fix to an earlier 3.4 blunder | Gregory P. Smith | 2013-04-30 | 0 | -0/+0 |
|\ \ | |/ | | | | | that already contains the right news) | ||||
| * | fix the news entry, the description in 3.3 should be different | Gregory P. Smith | 2013-04-30 | 1 | -3/+3 |
| | | | | | | | | than the one merged from 3.2 to match the actual changes here. | ||||
* | | merge | Gregory P. Smith | 2013-04-30 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | news entry | Gregory P. Smith | 2013-04-30 | 1 | -0/+4 |
| |\ | |||||
| | * | news entry | Gregory P. Smith | 2013-04-30 | 1 | -0/+4 |
| | | | |||||
* | | | null merge | Gregory P. Smith | 2013-04-30 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | null merge | Gregory P. Smith | 2013-04-30 | 0 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | This local change was lost during the fixing of issue17192 to update | Gregory P. Smith | 2013-04-30 | 1 | -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 changes | Gregory P. Smith | 2013-04-30 | 16 | -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 changes | Gregory P. Smith | 2013-04-30 | 16 | -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 patch | Gregory P. Smith | 2013-04-30 | 3 | -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 patch | Gregory P. Smith | 2013-04-30 | 3 | -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 undone | Gregory P. Smith | 2013-04-30 | 3 | -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 Peterson | 2013-04-29 | 2 | -143/+132 |
| | | | | | | | | | | | | Patch by Martin Morrison. | ||||
* | | | merge 3.3 (#17863) | Benjamin Peterson | 2013-04-29 | 2 | -9/+11 |
|\ \ \ | |/ / | |||||
| * | | ignore errors when trying to fetch sys.stdin.encoding (closes #17863) | Benjamin Peterson | 2013-04-29 | 2 | -9/+11 |
| | | | |||||
* | | | merge 3.3 | Benjamin Peterson | 2013-04-29 | 3 | -1/+11 |
|\ \ \ | |/ / | |||||
| * | | raise an ImportError (rather than fatal) when __import__ is not found in ↵ | Benjamin Peterson | 2013-04-29 | 3 | -1/+11 |
| | | | | | | | | | | | | __builtins__ (closes #17867) | ||||
* | | | Null merge, DataHandler exists in 3.4. | R David Murray | 2013-04-28 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | #7152: Remove incorrectly added reference to DataHandler. | R David Murray | 2013-04-28 | 1 | -1/+1 |
| | | | |||||
* | | | merge for issue #17358 | Brett Cannon | 2013-04-28 | 2 | -2/+15 |
|\ \ \ | |/ / | |||||
| * | | Issue #17358: imp.load_source() and load_compiled() should now return | Brett Cannon | 2013-04-28 | 2 | -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 Murray | 2013-04-28 | 2 | -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 Murray | 2013-04-28 | 2 | -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 Murray | 2013-04-28 | 3 | -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 Murray | 2013-04-28 | 3 | -9/+15 |
| | | | | | | | | | | | | Behavior confirmation and initial patch by Jessica McKellar. | ||||
* | | | Added base64 module tests for non-binary files. | Serhiy Storchaka | 2013-04-28 | 1 | -2/+10 |
|\ \ \ | |/ / | |||||
| * | | Added base64 module tests for non-binary files. | Serhiy Storchaka | 2013-04-28 | 1 | -2/+10 |
| | | | |||||
* | | | Issue #17842. Added base64 module tests with bytearray arguments. | Serhiy Storchaka | 2013-04-28 | 1 | -1/+26 |
|\ \ \ | |/ / | | | | | | | Original patch by Kushal Das. | ||||
| * | | Issue #17842. Added base64 module tests with bytearray arguments. | Serhiy Storchaka | 2013-04-28 | 1 | -1/+26 |
| | | | | | | | | | | | | Original patch by Kushal Das. | ||||
* | | | Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3, | Serhiy Storchaka | 2013-04-28 | 4 | -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 Storchaka | 2013-04-28 | 4 | -7/+10 |
| | | | | | | | | | | | | such as was shipped with Centos 5 and Mac OS X 10.4. | ||||
* | | | merge for issue #17357 | Brett Cannon | 2013-04-28 | 1 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | Issue #17357: Use more stern wording for | Brett Cannon | 2013-04-28 | 1 | -5/+5 |
| | | | | | | | | | | | | importlib.invalidate_caches(). | ||||
* | | | Issue #17804: New function ``struct.iter_unpack`` allows for streaming ↵ | Antoine Pitrou | 2013-04-26 | 5 | -1/+262 |
| | | | | | | | | | | | | struct unpacking. | ||||
* | | | merge heads | Giampaolo Rodola' | 2013-04-26 | 6 | -45/+93 |
|\ \ \ | |||||
| * | | | 17830: preserve line endings of original file when updating keywords. | R David Murray | 2013-04-25 | 3 | -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. Fixes | Senthil Kumaran | 2013-04-25 | 4 | -7/+48 |
| | | | | | | | | | | | | | | | | bugs with assignment to full_url. Patch by Demian Brecht. | ||||
* | | | | ftplib: update connect() docstring by mentioning 'timeout' argument | Giampaolo Rodola' | 2013-04-26 | 1 | -0/+1 |
|/ / / | |||||
* | | | Issue #17835: Fix test_io when the default OS pipe buffer size is larger ↵ | Antoine Pitrou | 2013-04-24 | 3 | -6/+11 |
|\ \ \ | |/ / | | | | | | | than one million bytes. | ||||
| * | | Issue #17835: Fix test_io when the default OS pipe buffer size is larger ↵ | Antoine Pitrou | 2013-04-24 | 3 | -6/+11 |
| | | | | | | | | | | | | than one million bytes. | ||||
* | | | Issue #17244: Windows doesn't let you set permissions on directories. | Brett Cannon | 2013-04-24 | 1 | -0/+2 |
| | | | |||||
* | | | Issue #17832: fix a compilation warning about a function prototype. | Antoine Pitrou | 2013-04-24 | 1 | -1/+2 |
| | | | | | | | | | | | | Also, make the private function static. | ||||
* | | | Revert c9674421d78e, leaving an additional comment | Eli Bendersky | 2013-04-24 | 1 | -5/+10 |
| | | | |||||
* | | | clean the environment from pre-existing PYTHONWARNINGS for test_warnings | Łukasz Langa | 2013-04-23 | 1 | -0/+12 |
|\ \ \ | |/ / | |||||
| * | | clean the environment from pre-existing PYTHONWARNINGS for test_warnings | Łukasz Langa | 2013-04-23 | 1 | -0/+12 |
| | | | |||||
* | | | null merge | Łukasz Langa | 2013-04-23 | 0 | -0/+0 |
|\ \ \ | |/ / |