Commit Graph

55707 Commits

Author SHA1 Message Date
Senthil Kumaran 93e3d3ac09 merge from 3.2 - Issue13685 2012-06-26 14:18:19 +08:00
Senthil Kumaran f21804ad61 Issue #13685 - Update argparse help message for % sign usage. 2012-06-26 14:17:19 +08:00
Vinay Sajip a57a8e072c Closes #15179: Merged fix from 3.2. 2012-06-25 23:20:27 +01:00
Vinay Sajip 3e6d71d336 Issue #15179: Closed socket on connection failure. Thanks to Kazutaka Morita for the patch. 2012-06-25 23:18:45 +01:00
Brett Cannon 0b1b9ce494 If main() is called and an argument cannot be decoded, make sure to
free the copy of the command-line.

Found using Clang's static analyzer.
2012-06-25 16:25:28 -04:00
Brett Cannon 8a250fac15 Comment out a dead increment.
Found by Clang's static analyzer.
2012-06-25 16:13:44 -04:00
David Malcolm 555bfc7ed0 Issue #14443: ensure that brp-python-bytecompile is invoked with the correct
python executable

The __os_install_macro defines some post-processing activities during an rpm
build; one of the scripts it calls is brp-python-bytecompile, which can take
an argument: the python executable with which to byte-compile .py files in the
package payload.

In some older versions of rpm (e.g. in RHEL 6), this invocation doesn't pass
in an argument, and brp-python-bytecompile defaults to using /usr/bin/python,
which can lead to the .py files being byte-compiled for the wrong version of
python.  This has been fixed in later versions of rpm by passing in
%{__python} as an argument to brp-python-bytecompile.

Workaround this by detecting if __os_install_post has a 0-argument invocation
of brp-python-bytecompile, and if so generating an equivalent macro that has
the argument, and explicitly provide the new definition within the specfile.
2012-06-25 15:52:24 -04:00
Antoine Pitrou 2e5f371210 Merge 2012-06-25 18:09:07 +02:00
Antoine Pitrou 1dd75a64aa Backport test_nntplib fixes from default. 2012-06-25 18:08:54 +02:00
Antoine Pitrou 0ab5cf9b46 Issue #15181: importlib bytecode is unsigned and shouldn't have negative numbers.
This fixes a compiler warning with suncc.
2012-06-25 17:32:43 +02:00
Stefan Krah 7334be889d Null merge. 2012-06-25 15:02:47 +02:00
Stefan Krah 62ba0428af Issue #15171: Try the HOST_PYTHON hack for 3.2. 2012-06-25 14:57:18 +02:00
Stefan Krah 1edab78859 Update test script to Visual Studio 2010. 2012-06-25 14:41:37 +02:00
Ned Deily 3784ff9811 Issue #13950: Improve support for OS X Xcode 4:
Fix ./configure to provide a more sensible default for
MACOSX_DEPLOYMENT_TARGET. Currently the default is the minimum OS X level
that supports the universal arch option, typically 10.4, even when no
universalsdk is selected. This causes various desirable features that
depend on later OS X versions, like libedit readline support, to be
omitted from the build. A more complete solution would take into account
the SDK that is being used and better tailor the universal arch options.
For now, change the existing tests to only apply to build systems of 10.5
and earlier; for 10.6 and later, use the build system version as the
default deployment target if the MACOSX_DEPLOYMENT_TARGET environment
variable is not provided.
2012-06-25 05:04:28 -07:00
Larry Hastings 52c60979ba Moved hmac.compare_digest Misc/NEWS entry from Core and Builtins to Library. 2012-06-25 04:51:59 -07:00
Larry Hastings c48fe98a7c Issue #15177: Added dir_fd parameter to os.fwalk(). 2012-06-25 04:49:05 -07:00
Jesus Cea 2a193a818a Skip test in freebsd entirely - Kernel bug in freebsd7/8/9 - #10142: Support for SEEK_HOLE/SEEK_DATA 2012-06-25 13:45:38 +02:00
Larry Hastings fdaea06d3c Issue #15176: Clarified behavior, documentation, and implementation
of os.listdir().
2012-06-25 04:42:23 -07:00
Hynek Schlawack 3b52778c74 #4489 Make fd based rmtree work on bytes 2012-06-25 13:27:31 +02:00
Larry Hastings 77892dc1e3 More doc fixes: made it clear where to start reading when you click on <dir_fd>. 2012-06-25 03:27:33 -07:00
Gregory P. Smith 68d34f48bf merge heads 2012-06-25 01:15:53 -07:00
Gregory P. Smith 875c1bc522 Backout change e8f44ebacda7052267318cecf5b6f128d35add17. Reverting the test
to using signal.alarm(1) instead of signal.setitimer(signal.ITIMER_REAL, 0.1).

This is an attempt to see if this change is what caused the ubuntu arm buildbot
to hang in test_io's test_interrupted_write_retry_text.
Discussion in Issue #12268.
2012-06-25 01:15:14 -07:00
Gregory P. Smith b5ba203709 Backout change e8f44ebacda7052267318cecf5b6f128d35add17. Reverting the test
to using signal.alarm(1) instead of signal.setitimer(signal.ITIMER_REAL, 0.1).

This is an attempt to see if this change is what caused the ubuntu arm buildbot
to hang in test_io's test_interrupted_write_retry_text.
Discussion in Issue #12268.
2012-06-25 01:13:32 -07:00
Larry Hastings 48986d68c2 Minor grammar refinement for hmac.compare_digest(). 2012-06-25 00:59:34 -07:00
Georg Brandl aceaf90804 Some tightening of the documentation for the new kwarg-style os module functionality. 2012-06-25 08:33:56 +02:00
Georg Brandl 4d399a4092 Grammar fix. 2012-06-25 07:40:32 +02:00
Eric V. Smith 714370fad1 Give test directory a more reasonable name. 2012-06-24 19:55:18 -04:00
Vinay Sajip 2895244653 Closes #15173: Tidied up copyright statements and removed pythonv references. 2012-06-25 00:47:46 +01:00
Eric V. Smith e51a36922f Fixes issue 15039: namespace packages are no longer imported in preference to modules of the same name. 2012-06-24 19:13:55 -04:00
Larry Hastings e6bdc8f2dd Restore Misc/NEWS entries lost in the merge for the previous commit. 2012-06-24 14:34:49 -07:00
Larry Hastings 68386bc0b8 Issue #15164: Change return value of platform.uname() from a
plain tuple to a collections.namedtuple.
2012-06-24 14:30:41 -07:00
Georg Brandl 56ed2844fa Merge with 3.2. 2012-06-24 22:50:30 +02:00
Georg Brandl 61063cca6a Fix a couple of versionadded/versionchanged related markup errors. 2012-06-24 22:48:30 +02:00
Georg Brandl 33369cf9a5 Fix a bunch of "versionchanged" related markup errors. 2012-06-24 22:48:03 +02:00
Antoine Pitrou f551001322 Merge 2012-06-24 22:42:05 +02:00
Antoine Pitrou ad09b5ddb9 Add a couple of what's new entries. 2012-06-24 22:41:33 +02:00
Antoine Pitrou 5d7e1d378c Fix statement. 2012-06-24 22:38:23 +02:00
Georg Brandl 217aa554fa Fix markup, for real this time. 2012-06-24 22:26:21 +02:00
Antoine Pitrou 00081f3869 Merge 2012-06-24 22:22:07 +02:00
Éric Araujo b0f0895849 Fix indentation 2012-06-24 16:22:09 -04:00
Antoine Pitrou ab88803a8a Support Mageia Linux in the platform module. 2012-06-24 22:20:18 +02:00
Georg Brandl 488fccfaaf Closes #11678: support Arch linux in the platform module. 2012-06-24 22:17:23 +02:00
Ezio Melotti becb70c329 Merge heads. 2012-06-24 22:04:02 +02:00
Ezio Melotti 46495182d0 #15156: HTMLParser now uses the new "html.entities.html5" dictionary. 2012-06-24 22:02:56 +02:00
Stefan Krah 3c0db67bf3 Drop useenv=true also from the 32-bit build script: It is not necessary and
leads to failures in successive 64-bit/32-bit builds in the same shell window.
2012-06-24 22:00:44 +02:00
Antoine Pitrou a504a7a7d1 Issue #15055: update dictnotes.txt. Patch by Mark Shannon. 2012-06-24 21:03:45 +02:00
Georg Brandl 87903c14bc Merge with 3.2. 2012-06-24 20:07:40 +02:00
Georg Brandl 26af3b223f Refer test_xmlrpc_net to the new buildbot URL at buildbot.python.org. 2012-06-24 20:06:54 +02:00
Georg Brandl cb1c8b7055 Merge with 3.2. 2012-06-24 20:02:59 +02:00
Georg Brandl 496660c56b Partial backport of 612f34e31270: fix spacing error in exception message. 2012-06-24 20:01:05 +02:00