python
12 years agoIssue #10287: nntplib now queries the server's CAPABILITIES first before sending...
Antoine Pitrou [Tue, 14 Feb 2012 22:30:35 +0000 (23:30 +0100)]
Issue #10287: nntplib now queries the server's CAPABILITIES first before sending MODE READER, and only sends it if not already in READER mode.
Patch by Hynek Schlawack.

12 years agoIssue #10287: nntplib now queries the server's CAPABILITIES first before sending...
Antoine Pitrou [Tue, 14 Feb 2012 22:29:34 +0000 (23:29 +0100)]
Issue #10287: nntplib now queries the server's CAPABILITIES first before sending MODE READER, and only sends it if not already in READER mode.
Patch by Hynek Schlawack.

12 years agoIssue #13979: Fix ctypes.util.find_library ldconfig regex
Meador Inge [Tue, 14 Feb 2012 04:23:59 +0000 (22:23 -0600)]
Issue #13979: Fix ctypes.util.find_library ldconfig regex

12 years agoIssue #13979: Fix ctypes.util.find_library ldconfig regex
Meador Inge [Tue, 14 Feb 2012 04:08:39 +0000 (22:08 -0600)]
Issue #13979: Fix ctypes.util.find_library ldconfig regex

12 years agoTime module doc: Fix reST syntax
Victor Stinner [Tue, 14 Feb 2012 01:42:21 +0000 (02:42 +0100)]
Time module doc: Fix reST syntax

12 years agoPyUnicode_DecodeLocale() second argument is now a char*, no more an int
Victor Stinner [Tue, 14 Feb 2012 01:33:38 +0000 (02:33 +0100)]
PyUnicode_DecodeLocale() second argument is now a char*, no more an int

12 years agomerge the import re (already in this branch).
Gregory P. Smith [Tue, 14 Feb 2012 00:44:18 +0000 (16:44 -0800)]
merge the import re (already in this branch).

12 years agore.escape os.sep so that \ is interpreted properly in the regex.
Gregory P. Smith [Tue, 14 Feb 2012 00:43:55 +0000 (16:43 -0800)]
re.escape os.sep so that \ is interpreted properly in the regex.

12 years agoimport re for the previous commit.
Gregory P. Smith [Tue, 14 Feb 2012 00:41:20 +0000 (16:41 -0800)]
import re for the previous commit.

12 years agore.escape os.sep so that \ is interpreted properly in the regex.
Gregory P. Smith [Tue, 14 Feb 2012 00:38:37 +0000 (16:38 -0800)]
re.escape os.sep so that \ is interpreted properly in the regex.

12 years agoIssue #13930: fix a / to use os.sep so that the test works on Windows.
Gregory P. Smith [Tue, 14 Feb 2012 00:26:50 +0000 (16:26 -0800)]
Issue #13930: fix a / to use os.sep so that the test works on Windows.

12 years agoIssue #13930: fix a / to use os.sep so that the test works on Windows.
Gregory P. Smith [Tue, 14 Feb 2012 00:24:46 +0000 (16:24 -0800)]
Issue #13930: fix a / to use os.sep so that the test works on Windows.

12 years ago(Merge 3.2) Issue #13913: normalize utf-8 codec name in UTF-8 decoder
Victor Stinner [Tue, 14 Feb 2012 00:18:10 +0000 (01:18 +0100)]
(Merge 3.2) Issue #13913: normalize utf-8 codec name in UTF-8 decoder

12 years agoIssue #13913: normalize utf-8 codec name in UTF-8 decoder
Victor Stinner [Tue, 14 Feb 2012 00:17:45 +0000 (01:17 +0100)]
Issue #13913: normalize utf-8 codec name in UTF-8 decoder

12 years agolib2to3 tests: Don't use deprecated API, switch to assertRegex()
Victor Stinner [Mon, 13 Feb 2012 22:31:26 +0000 (23:31 +0100)]
lib2to3 tests: Don't use deprecated API, switch to assertRegex()

12 years agoMerge the indexfix and comments clean up.
Ezio Melotti [Mon, 13 Feb 2012 18:28:46 +0000 (20:28 +0200)]
Merge the indexfix  and comments clean up.

12 years agoFix an index and clean up comments.
Ezio Melotti [Mon, 13 Feb 2012 18:20:00 +0000 (20:20 +0200)]
Fix an index and clean up comments.

12 years agoshutil copy module reference doc fix.
Senthil Kumaran [Mon, 13 Feb 2012 15:35:44 +0000 (23:35 +0800)]
shutil copy module reference doc fix.

12 years agoshutil copy module reference doc fix.
Senthil Kumaran [Mon, 13 Feb 2012 15:30:47 +0000 (23:30 +0800)]
shutil copy module reference doc fix.

12 years agoMerge fix for HTMLParser and improvements in declarations handling.
Ezio Melotti [Mon, 13 Feb 2012 13:52:25 +0000 (15:52 +0200)]
Merge fix for HTMLParser and improvements in declarations handling.

12 years agoImprove handling of declarations in HTMLParser.
Ezio Melotti [Mon, 13 Feb 2012 13:50:37 +0000 (15:50 +0200)]
Improve handling of declarations in HTMLParser.

12 years agoFix htmlparser tests to always use the right collector.
Ezio Melotti [Mon, 13 Feb 2012 12:11:27 +0000 (14:11 +0200)]
Fix htmlparser tests to always use the right collector.

12 years agoFix xml_etree_c test error (follow up of issue #13988).
Florent Xicluna [Mon, 13 Feb 2012 11:14:52 +0000 (12:14 +0100)]
Fix xml_etree_c test error (follow up of issue #13988).

12 years agoIssue #13988: cElementTree is deprecated and the _elementtree accelerator is automati...
Florent Xicluna [Mon, 13 Feb 2012 10:03:30 +0000 (11:03 +0100)]
Issue #13988: cElementTree is deprecated and the _elementtree accelerator is automatically used whenever available.

12 years ago#13993: merge with 3.2.
Ezio Melotti [Mon, 13 Feb 2012 09:42:29 +0000 (11:42 +0200)]
#13993: merge with 3.2.

12 years ago#13993: HTMLParser is now able to handle broken end tags when strict=False.
Ezio Melotti [Mon, 13 Feb 2012 09:24:50 +0000 (11:24 +0200)]
#13993: HTMLParser is now able to handle broken end tags when strict=False.

12 years agofix whitespace normalization before pushing.
Gregory P. Smith [Sun, 12 Feb 2012 23:59:00 +0000 (15:59 -0800)]
fix whitespace normalization before pushing.

12 years agofix whitespace normalization before pushing.
Gregory P. Smith [Sun, 12 Feb 2012 23:58:36 +0000 (15:58 -0800)]
fix whitespace normalization before pushing.

12 years agoIssue #13930: Adds ability for 2to3 to write its output to a different
Gregory P. Smith [Sun, 12 Feb 2012 23:56:49 +0000 (15:56 -0800)]
Issue #13930: Adds ability for 2to3 to write its output to a different
directory tree instead of overwriting the input files.  Adds three command
line options: -o/--output-dir, -W/--write-unchanged-files and --add-suffix.

12 years agoIssue #13930: Adds ability for 2to3 to write its output to a different
Gregory P. Smith [Sun, 12 Feb 2012 23:50:21 +0000 (15:50 -0800)]
Issue #13930: Adds ability for 2to3 to write its output to a different
directory tree instead of overwriting the input files.  Adds three command
line options: -o/--output-dir, -W/--write-unchanged-files and --add-suffix.

Feature backports into stable release branches for 2to3 are allowed by
a special exemption:
 http://mail.python.org/pipermail/python-dev/2011-December/115089.html

12 years agoMerge branch '3.2'
Petri Lehtinen [Sun, 12 Feb 2012 19:06:57 +0000 (21:06 +0200)]
Merge branch '3.2'

Closes #9750

12 years agoFix sqlite3.Connection.iterdump on tables/fields with reserved names or quotes
Petri Lehtinen [Sun, 12 Feb 2012 19:05:31 +0000 (21:05 +0200)]
Fix sqlite3.Connection.iterdump on tables/fields with reserved names or quotes

Closes #9750

12 years agoIssue #10287: nntplib now queries the server's CAPABILITIES again after authenticatin...
Antoine Pitrou [Sun, 12 Feb 2012 18:15:09 +0000 (19:15 +0100)]
Issue #10287: nntplib now queries the server's CAPABILITIES again after authenticating (since the result may change, according to RFC 4643).
Patch by Hynek Schlawack.

12 years agoIssue #10287: nntplib now queries the server's CAPABILITIES again after authenticatin...
Antoine Pitrou [Sun, 12 Feb 2012 18:14:17 +0000 (19:14 +0100)]
Issue #10287: nntplib now queries the server's CAPABILITIES again after authenticating (since the result may change, according to RFC 4643).
Patch by Hynek Schlawack.

12 years agoMerge with remote.
Ross Lagerwall [Sun, 12 Feb 2012 09:13:06 +0000 (11:13 +0200)]
Merge with remote.

12 years agoFix a typo.
Ross Lagerwall [Sun, 12 Feb 2012 07:02:01 +0000 (09:02 +0200)]
Fix a typo.

12 years agoAttempt to speed up some subprocess tests (and hopefully keep them reliable).
Ross Lagerwall [Sun, 12 Feb 2012 07:01:30 +0000 (09:01 +0200)]
Attempt to speed up some subprocess tests (and hopefully keep them reliable).

12 years agoPort the fix for #13193 to packaging
Éric Araujo [Sun, 12 Feb 2012 04:01:42 +0000 (05:01 +0100)]
Port the fix for #13193 to packaging

12 years agoMerge fixes for #13193 and FAQ from 3.2
Éric Araujo [Sun, 12 Feb 2012 03:58:46 +0000 (04:58 +0100)]
Merge fixes for #13193 and FAQ from 3.2

12 years agoFix distutils.filelist.FileList under Windows (#13193).
Éric Araujo [Sun, 12 Feb 2012 03:52:21 +0000 (04:52 +0100)]
Fix distutils.filelist.FileList under Windows (#13193).

The code used to call os.path.join to build a regex but without escaping
the backslash, which lead to test failures on Windows.  Antoine Pitrou
fixed it in 0a94e2f807c7 by enhancing the code to accept both / and \,
with proper escaping, but in my opinion this goes against the distutils
feature freeze, hence this change.

12 years agoUpdate mention of Subversion in the FAQ.
Éric Araujo [Sun, 12 Feb 2012 03:49:45 +0000 (04:49 +0100)]
Update mention of Subversion in the FAQ.

If I grepped correctly, this was the last outdated place.

12 years agoWhat's new typo
Antoine Pitrou [Sun, 12 Feb 2012 01:12:47 +0000 (02:12 +0100)]
What's new typo

12 years agoFix seekable() in BZ2File and LZMAFile to check whether the underlying file supports...
Nadeem Vawda [Sat, 11 Feb 2012 23:51:38 +0000 (01:51 +0200)]
Fix seekable() in BZ2File and LZMAFile to check whether the underlying file supports seek().

12 years agoAdd section on bz2 module to whatsnew/3.3.
Nadeem Vawda [Sat, 11 Feb 2012 23:34:18 +0000 (01:34 +0200)]
Add section on bz2 module to whatsnew/3.3.

12 years agoFix typo in whatsnew/3.3.
Nadeem Vawda [Sat, 11 Feb 2012 22:30:54 +0000 (00:30 +0200)]
Fix typo in whatsnew/3.3.

12 years agoClean up GzipFile mode string handling code.
Nadeem Vawda [Sat, 11 Feb 2012 22:06:02 +0000 (00:06 +0200)]
Clean up GzipFile mode string handling code.

12 years agoMerge: #13989: Document that GzipFile does not support text mode.
Nadeem Vawda [Sat, 11 Feb 2012 21:54:51 +0000 (23:54 +0200)]
Merge: #13989: Document that GzipFile does not support text mode.

12 years agoIssue #13989: Document that GzipFile does not support text mode.
Nadeem Vawda [Sat, 11 Feb 2012 21:45:10 +0000 (23:45 +0200)]
Issue #13989: Document that GzipFile does not support text mode.

Also, give a more helpful error message when opened with an invalid mode string.

12 years agoIssue #13988: move the python bootstrap code to cElementTree.py, and remove obsolete...
Florent Xicluna [Sat, 11 Feb 2012 10:28:16 +0000 (11:28 +0100)]
Issue #13988: move the python bootstrap code to cElementTree.py, and remove obsolete code for Python 2.4 and 2.5.

12 years agofix Doc/extending/extending.rst typo
Eli Bendersky [Sat, 11 Feb 2012 08:27:31 +0000 (10:27 +0200)]
fix Doc/extending/extending.rst typo

12 years agofix Sphinx error in os.rst
Eli Bendersky [Sat, 11 Feb 2012 07:52:29 +0000 (09:52 +0200)]
fix Sphinx error in os.rst

12 years agosimplify
Philip Jenvey [Fri, 10 Feb 2012 19:45:03 +0000 (11:45 -0800)]
simplify

12 years agomerge 3.2
Benjamin Peterson [Fri, 10 Feb 2012 13:47:04 +0000 (08:47 -0500)]
merge 3.2

12 years agothis is only a borrowed ref in Brett's branch
Benjamin Peterson [Fri, 10 Feb 2012 13:46:54 +0000 (08:46 -0500)]
this is only a borrowed ref in Brett's branch

12 years agoIssue #13590: merge
Ned Deily [Fri, 10 Feb 2012 12:08:44 +0000 (13:08 +0100)]
Issue #13590: merge

12 years agoIssue #13590: On OS X 10.7 and 10.6 with Xcode 4.2, building
Ned Deily [Fri, 10 Feb 2012 12:01:08 +0000 (13:01 +0100)]
Issue #13590: On OS X 10.7 and 10.6 with Xcode 4.2, building
Distutils-based packages with C extension modules may fail because
Apple has removed gcc-4.2, the version used to build python.org
64-bit/32-bit Pythons.  If the user does not explicitly override
the default C compiler by setting the CC environment variable,
Distutils will now attempt to compile extension modules with clang
if gcc-4.2 is required but not found. Also as a convenience, if
the user does explicitly set CC, substitute its value as the default
compiler in the Distutils LDSHARED configuration variable for OS X.
(Note, the python.org 32-bit-only Pythons use gcc-4.0 and the 10.4u
SDK, neither of which are available in Xcode 4.  This change does not
attempt to override settings to support their use with Xcode 4.)

12 years ago#13960: merge with 3.2.
Ezio Melotti [Fri, 10 Feb 2012 08:50:49 +0000 (10:50 +0200)]
#13960: merge with 3.2.

12 years ago#13960: HTMLParser is now able to handle broken comments when strict=False.
Ezio Melotti [Fri, 10 Feb 2012 08:45:44 +0000 (10:45 +0200)]
#13960: HTMLParser is now able to handle broken comments when strict=False.

12 years agoUse sys.version_info instead of sys.version in packaging.
Éric Araujo [Fri, 10 Feb 2012 04:20:53 +0000 (05:20 +0100)]
Use sys.version_info instead of sys.version in packaging.

The contents of this attribute are an implementation detail, as
documented for #9442, so we should not parse it, to support non-CPython
VMs with distutils2 in the future.

Unfortunately, one use comes directly from PEP 345, so an edit will have
to be agreed before fixing the code (see comment in p7g.markers).

Other remaining uses are found in p7g.compiler and could be replaced by
the platform module (which also parses sys.version, but then it wouldn’t
be my fault :)

12 years agoBranch merge
Éric Araujo [Fri, 10 Feb 2012 04:12:58 +0000 (05:12 +0100)]
Branch merge

12 years agoStart improving 2to3 code in packaging (#13462).
Éric Araujo [Thu, 9 Feb 2012 20:37:14 +0000 (21:37 +0100)]
Start improving 2to3 code in packaging (#13462).

- Change the fixers used in tests to something not provided by lib2to3
- Test conversion of doctests in text files
- Factor out test boilerplate into a common method

12 years agoSynchronize packaging.tests.support with distutils2
Éric Araujo [Thu, 9 Feb 2012 20:30:25 +0000 (21:30 +0100)]
Synchronize packaging.tests.support with distutils2

12 years agoMore boolean tests for packaging metadata environment markers
Éric Araujo [Thu, 9 Feb 2012 20:18:26 +0000 (21:18 +0100)]
More boolean tests for packaging metadata environment markers

12 years agoRemove unneeded import
Éric Araujo [Thu, 9 Feb 2012 20:17:46 +0000 (21:17 +0100)]
Remove unneeded import

12 years agoUndocument and clean up sqlite3.OptimizedUnicode
Petri Lehtinen [Thu, 9 Feb 2012 19:09:03 +0000 (21:09 +0200)]
Undocument and clean up sqlite3.OptimizedUnicode

Closes #13921.

12 years agoGroup commands by topic in “pysetup run --list-commands” output.
Éric Araujo [Thu, 9 Feb 2012 13:29:11 +0000 (14:29 +0100)]
Group commands by topic in “pysetup run --list-commands” output.

This fixes a regression from distutils, where “setup.py --help-commands”
prints out commands grouped by topic (i.e. building vs. installing),
which is more useful than using sorted.

12 years agomerge from 3.2
Senthil Kumaran [Thu, 9 Feb 2012 10:27:48 +0000 (18:27 +0800)]
merge from 3.2

Issue #9021 - Introduce copy module better in the docs.

12 years agoIssue #9021 - Introduce copy module better. Doc changes suggested by Terry
Senthil Kumaran [Thu, 9 Feb 2012 10:26:59 +0000 (18:26 +0800)]
Issue #9021 - Introduce copy module better. Doc changes suggested by Terry
Reedy.

12 years agomerged from 3.2
Senthil Kumaran [Thu, 9 Feb 2012 09:55:56 +0000 (17:55 +0800)]
merged from 3.2

Issue #6005: Examples in the socket library documentation use sendall, where
relevant, instead send method.

12 years agoFix Issue #6005: Examples in the socket library documentation use sendall,
Senthil Kumaran [Thu, 9 Feb 2012 09:54:17 +0000 (17:54 +0800)]
Fix Issue #6005: Examples in the socket library documentation use sendall,
where relevant, instead send method.

12 years agoUndo a bad mq management thingy.
Brett Cannon [Thu, 9 Feb 2012 00:11:53 +0000 (19:11 -0500)]
Undo a bad mq management thingy.

12 years agoWhitespace normalization.
Brett Cannon [Wed, 8 Feb 2012 23:55:37 +0000 (18:55 -0500)]
Whitespace normalization.

12 years agoClarify a NEWS entry.
Brett Cannon [Wed, 8 Feb 2012 23:53:46 +0000 (18:53 -0500)]
Clarify a NEWS entry.

12 years agoUse the cwd when the empty string is found in sys.path. This leads to
Brett Cannon [Wed, 8 Feb 2012 23:52:56 +0000 (18:52 -0500)]
Use the cwd when the empty string is found in sys.path. This leads to
__file__ being an absolute path when the module is found in the
current directory.

12 years agoMove setup code from importlib.__init__ to
Brett Cannon [Wed, 8 Feb 2012 23:50:22 +0000 (18:50 -0500)]
Move setup code from importlib.__init__ to
importlib._bootstrap._setup().

12 years agoDon't fail in the face of a lacking attribute when wrapping a
Brett Cannon [Wed, 8 Feb 2012 23:44:14 +0000 (18:44 -0500)]
Don't fail in the face of a lacking attribute when wrapping a
function.

12 years agoget_terminal_size() can also fail with ENOTTY if the fd is not connected to a terminal.
Antoine Pitrou [Wed, 8 Feb 2012 23:11:00 +0000 (00:11 +0100)]
get_terminal_size() can also fail with ENOTTY if the fd is not connected to a terminal.

12 years agoRelax tests to fix buildbot failure
Antoine Pitrou [Wed, 8 Feb 2012 22:48:59 +0000 (23:48 +0100)]
Relax tests to fix buildbot failure

12 years agoIssue #13609: Add two functions to query the terminal size:
Antoine Pitrou [Wed, 8 Feb 2012 22:28:36 +0000 (23:28 +0100)]
Issue #13609: Add two functions to query the terminal size:
os.get_terminal_size (low level) and shutil.get_terminal_size (high level).
Patch by Zbigniew Jędrzejewski-Szmek.

12 years agoBackout f8409b3d6449: the PEP 410 is not accepted yet
Victor Stinner [Wed, 8 Feb 2012 22:03:19 +0000 (23:03 +0100)]
Backout f8409b3d6449: the PEP 410 is not accepted yet

12 years agoIssue #13845: Fix NEWS entry, the change is specific to Windows
Victor Stinner [Wed, 8 Feb 2012 21:53:24 +0000 (22:53 +0100)]
Issue #13845: Fix NEWS entry, the change is specific to Windows

12 years agoSkip test_threading.test_reinit_tls_after_fork() on platforms where fork()
Charles-François Natali [Wed, 8 Feb 2012 20:29:11 +0000 (21:29 +0100)]
Skip test_threading.test_reinit_tls_after_fork() on platforms where fork()
can't be called reliably from a worker thread.

12 years agoPEP 410
Victor Stinner [Wed, 8 Feb 2012 13:31:50 +0000 (14:31 +0100)]
PEP 410

12 years agoSkip test_threading.test_reinit_tls_after_fork() on platforms where fork()
Charles-François Natali [Wed, 8 Feb 2012 20:30:02 +0000 (21:30 +0100)]
Skip test_threading.test_reinit_tls_after_fork() on platforms where fork()
can't be called reliably from a worker thread.

12 years agoIssue #8184: multiprocessing: On Windows, don't set SO_REUSEADDR on Connection
Charles-François Natali [Wed, 8 Feb 2012 20:15:58 +0000 (21:15 +0100)]
Issue #8184: multiprocessing: On Windows, don't set SO_REUSEADDR on Connection
sockets, and set FILE_FLAG_FIRST_PIPE_INSTANCE on named pipes, to make sure two
listeners can't bind to the same socket/pipe (or any existing socket/pipe).

12 years agoIssue #13964: Skip os.*utime*() tests if os.stat() doesn't support timestamp
Victor Stinner [Wed, 8 Feb 2012 03:09:37 +0000 (04:09 +0100)]
Issue #13964: Skip os.*utime*() tests if os.stat() doesn't support timestamp
with a subsecond resolution

12 years agoIssue #13964: Split os.*utime*() subsecond tests into multiple tests to help
Victor Stinner [Wed, 8 Feb 2012 02:36:25 +0000 (03:36 +0100)]
Issue #13964: Split os.*utime*() subsecond tests into multiple tests to help
debugging

12 years agoIssue #13964: Test also os.futimesat()
Victor Stinner [Wed, 8 Feb 2012 02:07:25 +0000 (03:07 +0100)]
Issue #13964: Test also os.futimesat()

12 years agoIssue #13964: Write tests for new os.*utime*() functions
Victor Stinner [Wed, 8 Feb 2012 02:01:11 +0000 (03:01 +0100)]
Issue #13964: Write tests for new os.*utime*() functions

12 years agoWhat's New in 3.3: reorder modules
Victor Stinner [Wed, 8 Feb 2012 00:48:34 +0000 (01:48 +0100)]
What's New in 3.3: reorder modules

Remove also duplicate functions in the "os" module section

12 years agoWhat's New in 3.3: Fix time module doc
Victor Stinner [Wed, 8 Feb 2012 00:43:34 +0000 (01:43 +0100)]
What's New in 3.3: Fix time module doc

12 years agoIssue #13845: time.time() now uses GetSystemTimeAsFileTime() instead of ftime()
Victor Stinner [Tue, 7 Feb 2012 22:41:01 +0000 (23:41 +0100)]
Issue #13845: time.time() now uses GetSystemTimeAsFileTime() instead of ftime()
to have a resolution of 100 ns instead of 1 ms (the clock accuracy is between
0.5 ms and 15 ms).

12 years agoIssue #13846: Add time.monotonic(), monotonic clock.
Victor Stinner [Tue, 7 Feb 2012 22:29:46 +0000 (23:29 +0100)]
Issue #13846: Add time.monotonic(), monotonic clock.

12 years agoBackout d2c1521ad0a1: _Py_IDENTIFIER() uses UTF-8 again
Victor Stinner [Tue, 7 Feb 2012 22:05:55 +0000 (23:05 +0100)]
Backout d2c1521ad0a1: _Py_IDENTIFIER() uses UTF-8 again

12 years agoRe-order importlib benchmarks to be consistent. Also print out what implementation...
Brett Cannon [Tue, 7 Feb 2012 14:40:33 +0000 (09:40 -0500)]
Re-order importlib benchmarks to be consistent. Also print out what implementation of __import__ is used.

12 years agoMerge
Brett Cannon [Tue, 7 Feb 2012 14:20:20 +0000 (09:20 -0500)]
Merge

12 years agoHave importlib.test.benchmark test with tabnanny as a medium-sized test.
Brett Cannon [Tue, 7 Feb 2012 14:19:12 +0000 (09:19 -0500)]
Have importlib.test.benchmark test with tabnanny as a medium-sized test.

12 years agoNull merge for reverted fix for #13807.
Vinay Sajip [Mon, 6 Feb 2012 21:25:43 +0000 (21:25 +0000)]
Null merge for reverted fix for #13807.

12 years agoNull merge for reverted fix for #13807.
Vinay Sajip [Mon, 6 Feb 2012 21:24:40 +0000 (21:24 +0000)]
Null merge for reverted fix for #13807.

12 years agoMerge branch '3.2'
Petri Lehtinen [Mon, 6 Feb 2012 20:04:41 +0000 (22:04 +0200)]
Merge branch '3.2'