Commit Graph

78831 Commits

Author SHA1 Message Date
Ezio Melotti f256f5f3eb #17881: merge with 3.3. 2013-04-30 16:34:30 +03:00
Ezio Melotti ab6ab15e7d #17881: clarify documentation of plistlib. 2013-04-30 16:34:04 +03:00
Gregory P. Smith 60342fea4e merge (no news entry needed for this fix to an earlier 3.4 blunder
that already contains the right news)
2013-04-30 01:05:28 -07:00
Gregory P. Smith 2a6486cded merge 2013-04-30 01:03:46 -07:00
Gregory P. Smith 5d6620d9d5 fix the news entry, the description in 3.3 should be different
than the one merged from 3.2 to match the actual changes here.
2013-04-30 01:01:54 -07:00
Gregory P. Smith fde108ba37 news entry 2013-04-30 00:58:24 -07:00
Gregory P. Smith cf86d9441e news entry 2013-04-30 00:57:18 -07:00
Gregory P. Smith 9012f144be null merge 2013-04-30 00:06:20 -07:00
Gregory P. Smith 671905de89 null merge 2013-04-30 00:05:50 -07:00
Gregory P. Smith 910bfb7beb This local change was lost during the fixing of issue17192 to update
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)
2013-04-30 00:05:25 -07:00
Gregory P. Smith d8fe1f7881 * Fix remaining bits of issue 17192 for 3.4 - these changes
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.
2013-04-30 00:03:30 -07:00
Gregory P. Smith 5dc268ed26 * Fix remaining bits of issue 17192 for 3.3 - these changes
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.
2013-04-30 00:03:01 -07:00
Gregory P. Smith 6897267759 * Fix PART of issue 17192 for 3.4 - reapply the issue11729 patch
that was undone in the merge fun from upstream which already
  had it in 3.0.13.
* Add the missing update to libffi.info.
2013-04-29 23:48:03 -07:00
Gregory P. Smith e9d0633d36 * Fix PART of issue 17192 for 3.3 - reapply the issue11729 patch
that was undone in the merge fun from upstream which already
  had it in 3.0.13.
* Add the missing update to libffi.info.
2013-04-29 23:47:17 -07:00
Gregory P. Smith 933059710c * Fix issue 17192 for 3.2 - reapply the issue11729 patch that was undone
in the merge fun from upstream which already had it in 3.0.13.
* Add the missing update to libffi.info.
2013-04-29 23:45:38 -07:00
Benjamin Peterson d9fec15e9b refactor traceback.py to reduce code duplication (closes #17646)
Patch by Martin Morrison.
2013-04-29 16:09:39 -04:00
Benjamin Peterson 0bb83f812f merge 3.3 (#17863) 2013-04-29 10:23:31 -04:00
Benjamin Peterson fe1b22af0a ignore errors when trying to fetch sys.stdin.encoding (closes #17863) 2013-04-29 10:23:08 -04:00
Benjamin Peterson 5c089314ef merge 3.3 2013-04-29 09:08:33 -04:00
Benjamin Peterson 7d110042c5 raise an ImportError (rather than fatal) when __import__ is not found in __builtins__ (closes #17867) 2013-04-29 09:08:14 -04:00
R David Murray 91c2f37e21 Null merge, DataHandler exists in 3.4. 2013-04-28 17:07:16 -04:00
R David Murray 775ccdf1fc #7152: Remove incorrectly added reference to DataHandler. 2013-04-28 17:06:01 -04:00
Brett Cannon e1d30f24ee merge for issue #17358 2013-04-28 11:58:31 -04:00
Brett Cannon 5a4c233a9e Issue #17358: imp.load_source() and load_compiled() should now return
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.
2013-04-28 11:53:26 -04:00
R David Murray d4c1b36c39 Merge: Reflow paragraphs.
(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.)
2013-04-28 11:30:19 -04:00
R David Murray 9330a94467 Reflow paragraphs.
I know one of them looks worse, but now it is <80 chars and
matches the 2.7 text.
2013-04-28 11:24:35 -04:00
R David Murray 876f08e3ae Merge #7152: Clarify that ProxyHandler is added only if proxy settings are detected.
Behavior confirmation and initial patch by Jessica McKellar.
2013-04-28 11:08:27 -04:00
R David Murray 5aea37ad1d #7152: Clarify that ProxyHandler is added only if proxy settings are detected.
Behavior confirmation and initial patch by Jessica McKellar.
2013-04-28 11:07:16 -04:00
Serhiy Storchaka 337f9785fc Added base64 module tests for non-binary files. 2013-04-28 15:56:32 +03:00
Serhiy Storchaka abac0a7744 Added base64 module tests for non-binary files. 2013-04-28 15:56:11 +03:00
Serhiy Storchaka 1cda4535b5 Issue #17842. Added base64 module tests with bytearray arguments.
Original patch by Kushal Das.
2013-04-28 15:53:54 +03:00
Serhiy Storchaka 017523c4f4 Issue #17842. Added base64 module tests with bytearray arguments.
Original patch by Kushal Das.
2013-04-28 15:53:08 +03:00
Serhiy Storchaka 5f99fa7287 Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
such as was shipped with Centos 5 and Mac OS X 10.4.
2013-04-28 14:11:55 +03:00
Serhiy Storchaka d160b12292 Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
such as was shipped with Centos 5 and Mac OS X 10.4.
2013-04-28 14:10:27 +03:00
Brett Cannon 1f6ee73c1e merge for issue #17357 2013-04-27 23:20:55 -04:00
Brett Cannon 4067aa272e Issue #17357: Use more stern wording for
importlib.invalidate_caches().
2013-04-27 23:20:32 -04:00
Antoine Pitrou 9f14681959 Issue #17804: New function ``struct.iter_unpack`` allows for streaming struct unpacking. 2013-04-27 00:20:04 +02:00
Giampaolo Rodola' 3da670749a merge heads 2013-04-26 15:24:42 +02:00
Giampaolo Rodola' 11a9bd62b1 ftplib: update connect() docstring by mentioning 'timeout' argument 2013-04-26 15:23:43 +02:00
R David Murray f0f7ceae3c 17830: preserve line endings of original file when updating keywords.
This fixes the test failures on Windows from the new tests, and
includes test fixes as well as the module fix.
2013-04-25 12:01:36 -04:00
Senthil Kumaran 5238092592 Issue #17272: Making the urllib.request's Request.full_url a descriptor. Fixes
bugs with assignment to full_url. Patch by Demian Brecht.
2013-04-25 05:45:48 -07:00
Antoine Pitrou 34373b2252 Issue #17835: Fix test_io when the default OS pipe buffer size is larger than one million bytes. 2013-04-24 23:33:20 +02:00
Antoine Pitrou e1a1674e1e Issue #17835: Fix test_io when the default OS pipe buffer size is larger than one million bytes. 2013-04-24 23:31:38 +02:00
Brett Cannon 51460cc490 Issue #17244: Windows doesn't let you set permissions on directories. 2013-04-24 16:34:07 -04:00
Antoine Pitrou 208ac5cf65 Issue #17832: fix a compilation warning about a function prototype.
Also, make the private function static.
2013-04-24 20:17:53 +02:00
Eli Bendersky 45f3d2fff0 Revert c9674421d78e, leaving an additional comment 2013-04-24 05:34:07 -07:00
Łukasz Langa 06d3abbff3 clean the environment from pre-existing PYTHONWARNINGS for test_warnings 2013-04-24 01:51:42 +02:00
Łukasz Langa 6ae466732c clean the environment from pre-existing PYTHONWARNINGS for test_warnings 2013-04-24 01:49:52 +02:00
Łukasz Langa 1ca17c28d2 null merge 2013-04-24 01:30:20 +02:00
Łukasz Langa 20ea96f29a backported rev 79713 from 3.4, test_recursion_limit skipped for -O0 2013-04-24 01:29:26 +02:00