Commit Graph

56203 Commits

Author SHA1 Message Date
Meador Inge b14d8c9bcf Issue #15402: Add a __sizeof__ method to struct.Struct.
Initial patch by Serhiy Storchaka.
2012-07-23 10:01:29 -05:00
Meador Inge fe114f0293 Putting the 3.2 -> default merge info in a happy place. 2012-07-23 09:16:53 -05:00
Raymond Hettinger d3f63d3661 Simplify the LaTeX section (only three escapes are needed for alltt) 2012-07-23 00:24:24 -05:00
Senthil Kumaran 7e918cfe28 merge heads. 2012-07-22 19:32:44 -07:00
Senthil Kumaran 392bfd30af merge heads. 2012-07-22 19:32:17 -07:00
Senthil Kumaran d74062948d - Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch contributed by Chris Jerdonek. 2012-07-22 19:31:36 -07:00
Senthil Kumaran 28a9f2193a - Issue #15250: Document that filecmp.dircmp compares files shallowly. Patch contributed by Chris Jerdonek. 2012-07-22 19:12:58 -07:00
R David Murray 970bef295d Merge #15232: correctly mangle From lines in MIME preamble and epilogue 2012-07-22 21:53:54 -04:00
R David Murray 6a31bc6d81 #15232: correctly mangle From lines in MIME preamble and epilogue 2012-07-22 21:47:53 -04:00
R David Murray 4fb6b0a104 Merge #15429: Fix invalid mention of types.NoneType from None docs. 2012-07-22 20:43:42 -04:00
R David Murray e60e12b57a #15429: Fix invalid mention of types.NoneType from None docs. 2012-07-22 20:43:13 -04:00
Andrew Svetlov 80823d7ed7 #15094: fix incorrectly placed #endif in _tkinter.c.
Patch by Serhiy Storchaka.
2012-07-22 13:56:54 +03:00
Ned Deily c7a5a76b1e Issue #15184: Some config variables in test_sysconfig_module
may differ between sysconfig and distutils.sysconfig due to
compiler customizations on OS X.  For now, move those vars
into a separate test and skip if the customization has taken
place in distutils.  The long-term solution is to eliminate
having two sysconfig modules.
2012-07-22 02:56:36 -07:00
Ned Deily 2c80e120a9 Issue #15188: Prevent test_ldshared_value failure due to slightly
different parsing of the Makefile by distutils.sysconfig and
sysconfig in the case when an intermediate config vars, used to
construct PY_CFLAGS or PY_LDFLAGS, has a trailing space character.
In this case, the OS X installer build script was leaving a
trailing space in the OPT and LDFLAGS config vars.  The space is not
significant and it's not worth toying with the Makefile parsing.
2012-07-22 00:46:46 -07:00
Ned Deily 1ef871969c Issue #15184: Fix test__remove_unsupported_archs failures on 10.6
by removing unwarranted assumptions that clang compiler chain
cannot handle ppc (the driver passes off ppc compiles to gcc).
Mock the behavior instead.
2012-07-21 22:35:16 -07:00
Gregory P. Smith 34fcafde16 Consistently raise a TypeError when a non str is passed to hashlib.new
regardless of which of the two implementations of new is used.
2012-07-21 21:20:44 -07:00
Gregory P. Smith 76c28f7ce2 Consistently raise a TypeError when a non str is passed to hashlib.new
regardless of which of the two implementations of new is used.
2012-07-21 21:19:53 -07:00
R David Murray 45ccf032be Merge #13922: argparse no longer incorrectly strips '--' after the first one.
Patch by Jeff Knupp.
2012-07-21 22:56:49 -04:00
R David Murray 00528e8fec #13922: argparse no longer incorrectly strips '--' after the first one.
Patch by Jeff Knupp.
2012-07-21 22:48:35 -04:00
R David Murray d4703d1d85 Merge #12353: argparse now correctly handles null argument values.
Patch by Torsten Landschoff.
2012-07-21 22:28:08 -04:00
R David Murray b94082a71b #12353: argparse now correctly handles null argument values.
Patch by Torsten Landschoff.
2012-07-21 22:20:11 -04:00
R David Murray af418b2232 Merge #14391: clarify docstring discussion of Action's 'type' argument's value. 2012-07-21 17:05:24 -04:00
R David Murray 15cd9a0be4 #14391: clarify docstring discussion of Action's 'type' argument's value. 2012-07-21 17:04:25 -04:00
R David Murray 779b63d005 Merge #15342: Add clarifying sentence to posixpath.join docstring.
This sentence appears as a clarifying note in the HTML docs, and seems
worth having in the docstring since it covers a very common use case
that isn't otherwise obvious.  Thanks to Yongzhi Pan for the suggestion.
2012-07-21 14:34:51 -04:00
R David Murray e3de175a5e #15342: Add clarifying sentence to posixpath.join docstring.
This sentence appears as a clarifying note in the HTML docs, and seems
worth having in the docstring since it covers a very common use case
that isn't otherwise obvious.  Thanks to Yongzhi Pan for the suggestion.
2012-07-21 14:33:56 -04:00
Ned Deily a606aef743 Issue #15188: Modify the OS X build_installer script to remove temporary
build paths from configuration variables cached in _sysconfigdata.py, as
is already done for the installed Makefile.  This avoids a distuils test
case failure in test_ldshared_value.
2012-07-21 10:48:09 -07:00
Eli Bendersky 7b31b1a2a4 Raise ImportError if pyexpat's version is incompatible 2012-07-21 20:32:39 +03:00
Eli Bendersky ef391ac982 Raise ImportError if pyexpat's version is incompatible 2012-07-21 20:28:46 +03:00
Ned Deily 2731c049ac Issue #15184: Ensure configuration-related environment variables
are unset during test execution.
2012-07-21 09:29:54 -07:00
Brett Cannon 636601dfba Remove a relative import that escaped test.test_importlib. 2012-07-21 09:54:58 -04:00
Ned Deily df8aa2b325 Issue #15184: Ensure consistent results of OS X configuration
tailoring for universal builds by factoring out common OS X-specific
customizations from sysconfig, distutils.sysconfig, distutils.util,
and distutils.unixccompiler into a new module _osx_support that can
eventually also be used by packaging.
2012-07-21 05:36:30 -07:00
Florent Xicluna 0fd1062a76 Fix test_pprint random dict ordering. 2012-07-21 12:45:02 +02:00
Florent Xicluna 6e571d699f Fix test_pprint random dict ordering. 2012-07-21 12:44:20 +02:00
Florent Xicluna 6a01fc5d41 Issues #10017 and #14998: Fix TypeError using pprint on dictionaries with unorderable key. 2012-07-21 11:22:33 +02:00
Florent Xicluna d6da90f93d Issues #10017 and #14998: Fix TypeError using pprint on dictionaries with unorderable key. 2012-07-21 11:17:38 +02:00
Meador Inge 5116704ec5 Issue #15410: Fix the urllib.request.Request.is_unverifiable deprecation documentation. 2012-07-20 19:50:41 -05:00
Meador Inge da1ffbc4ee Issue #15409: Replace use of deprecated urllib.request.Request methods in http.cookijar
Patch by Flávio Ribeiro.
2012-07-20 19:12:04 -05:00
Antoine Pitrou 5e36edbaba Port additional tests from #14579 (the issue is already fixed). 2012-07-21 00:47:48 +02:00
Antoine Pitrou b4bbee25b1 Issue #14579: Fix CVE-2012-2135: vulnerability in the utf-16 decoder after error handling.
Patch by Serhiy Storchaka.
2012-07-21 00:45:14 +02:00
Ned Deily cc409f4ecc Issue #15168: Ensure test_importlib subdirectories are installed. 2012-07-20 13:24:58 -07:00
Brett Cannon ed19fcec89 Fix another import error. 2012-07-20 15:42:34 -04:00
Brett Cannon 86ae981da9 Fix an import from the importlib.test move. 2012-07-20 15:40:57 -04:00
Brett Cannon d382bfc921 Move importlib.test.benchmark to Tools/importbench to make it more
visible and to place it with other micro-benchmarks (e.g.
stringbench).
2012-07-20 14:54:53 -04:00
Brett Cannon 45a5e3afe5 Issue #15168: Move importlb.test to test.test_importlib.
This should make the Linux distros happy as it is now easier to leave
importlib's tests out of their base Python distribution.
2012-07-20 14:48:53 -04:00
Brett Cannon 4afc1c08d0 Merge 2012-07-20 14:22:27 -04:00
Brett Cannon 6ee9695270 Issue #15091: Call importlib.invalidate_caches() and reactivate a test
of importing a symlinked package.
2012-07-20 14:22:04 -04:00
Brett Cannon ba52586f76 Running the importlib tests from test_import is redundant as there is
no difference anymore between __import__ and importlib.__import__.
2012-07-20 14:01:34 -04:00
Meador Inge b17ad53e39 Issue #15406: Fix deprecation warning in ctypes test_bitfields.py
Patch by Flávio Ribeiro.
2012-07-20 12:52:42 -05:00
Meador Inge ca9652ea5d Issue #15406: Fix deprecation warning in ctypes test_bitfields.py
Patch by Flávio Ribeiro.
2012-07-20 12:48:34 -05:00
Nick Coghlan be7e49fd82 Close #15386: There was a loophole that meant importlib.machinery and imp would sometimes reference an uninitialised copy of importlib._bootstrap 2012-07-20 23:40:09 +10:00