]> granicus.if.org Git - python/log
python
11 years agoIssue #16612: Add "Argument Clinic", a compile-time preprocessor
Larry Hastings [Sat, 19 Oct 2013 07:09:25 +0000 (00:09 -0700)]
Issue #16612: Add "Argument Clinic", a compile-time preprocessor
for C files to generate argument parsing code.  (See PEP 436.)

11 years agoEnsure setup.py looks for zlib.h in an OS X SDK.
Ned Deily [Sat, 19 Oct 2013 04:34:58 +0000 (21:34 -0700)]
Ensure setup.py looks for zlib.h in an OS X SDK.

11 years agoEnsure setup.py looks for zlib.h in an OS X SDK.
Ned Deily [Sat, 19 Oct 2013 04:32:00 +0000 (21:32 -0700)]
Ensure setup.py looks for zlib.h in an OS X SDK.

11 years agoIssue #19019: Change the OS X installer build script to use CFLAGS instead
Ned Deily [Sat, 19 Oct 2013 04:16:05 +0000 (21:16 -0700)]
Issue #19019: Change the OS X installer build script to use CFLAGS instead
of OPT for special build options.  By setting OPT, some compiler-specific
options like -fwrapv were overridden and thus not used, which could result
in broken interpreters when building with clang.

11 years agoIssue #14499: Fix several problems with OS X universal build support:
Ned Deily [Sat, 19 Oct 2013 04:09:56 +0000 (21:09 -0700)]
Issue #14499: Fix several problems with OS X universal build support:
    1. ppc arch detection for extension module builds broke with Xcode 5
    2. ppc arch detection in configure did not work on OS X 10.4
    3. -sysroot and -arch flags were unnecessarily duplicated
    4. there was no obvious way to configure an intel-32 only build.

11 years agoIssue #15663: Update OS X installer to use Tcl/Tk 8.5.15.
Ned Deily [Sat, 19 Oct 2013 03:49:27 +0000 (20:49 -0700)]
Issue #15663: Update OS X installer to use Tcl/Tk 8.5.15.

11 years agoUpdate OS X installer for building on 10.9.
Ned Deily [Sat, 19 Oct 2013 03:42:32 +0000 (20:42 -0700)]
Update OS X installer for building on 10.9.

11 years agoUpdate OS X installer for building on 10.9.
Ned Deily [Sat, 19 Oct 2013 03:41:16 +0000 (20:41 -0700)]
Update OS X installer for building on 10.9.

11 years agoIssue #16742: My fix on PyOS_StdioReadline() was incomplete, PyMem_FREE() was
Victor Stinner [Sat, 19 Oct 2013 00:40:16 +0000 (02:40 +0200)]
Issue #16742: My fix on PyOS_StdioReadline() was incomplete, PyMem_FREE() was
not patched

11 years agoWrite flow control for asyncio (includes asyncio.streams overhaul).
Guido van Rossum [Fri, 18 Oct 2013 22:17:11 +0000 (15:17 -0700)]
Write flow control for asyncio (includes asyncio.streams overhaul).

11 years agoRelax some asyncio test timeouts (http://bugs.python.org/issue19285).
Guido van Rossum [Fri, 18 Oct 2013 22:15:56 +0000 (15:15 -0700)]
Relax some asyncio test timeouts (http://bugs.python.org/issue19285).

11 years agoIssue #19222: Add support for the 'x' mode to the gzip module.
Nadeem Vawda [Fri, 18 Oct 2013 22:11:13 +0000 (00:11 +0200)]
Issue #19222: Add support for the 'x' mode to the gzip module.

Original patch by Tim Heaney.

11 years agoIssue #19223: Add support for the 'x' mode to the bz2 module.
Nadeem Vawda [Fri, 18 Oct 2013 22:11:06 +0000 (00:11 +0200)]
Issue #19223: Add support for the 'x' mode to the bz2 module.

Patch by Tim Heaney and Vajrasky Kok.

11 years agoIssue #19201: Add support for the 'x' mode to the lzma module.
Nadeem Vawda [Fri, 18 Oct 2013 22:06:19 +0000 (00:06 +0200)]
Issue #19201: Add support for the 'x' mode to the lzma module.

Patch by Tim Heaney and Vajrasky Kok.

11 years agoFix test to not consider mixin a standalone test
Brett Cannon [Fri, 18 Oct 2013 20:55:15 +0000 (16:55 -0400)]
Fix test to not consider mixin a standalone test

11 years agoIssue #16803: Move test_importlib.test_util to use both frozen and
Brett Cannon [Fri, 18 Oct 2013 19:40:11 +0000 (15:40 -0400)]
Issue #16803: Move test_importlib.test_util to use both frozen and
source code.

11 years agoIssue #16803: Have test_importlib.test_locks use frozen and source
Brett Cannon [Fri, 18 Oct 2013 19:12:21 +0000 (15:12 -0400)]
Issue #16803: Have test_importlib.test_locks use frozen and source
code.

11 years agoFix a refleak in _sre
Brett Cannon [Fri, 18 Oct 2013 18:03:16 +0000 (14:03 -0400)]
Fix a refleak in _sre

11 years agoAdd NEWS entry for issue #18810
Brett Cannon [Fri, 18 Oct 2013 17:29:04 +0000 (13:29 -0400)]
Add NEWS entry for issue #18810

11 years agoIssue #18810: Be optimistic with stat calls when seeing if a directory
Brett Cannon [Fri, 18 Oct 2013 17:24:13 +0000 (13:24 -0400)]
Issue #18810: Be optimistic with stat calls when seeing if a directory
exists when checking for a package.

Before there was an isdir check and then various isfile checks for
possible __init__ files when looking for a package.
This change drops the isdir check by leaning
on the assumption that a directory will not contain something named
after the module being imported which is not a directory. If the module
is a package then it saves a stat call. If there is nothing in the
directory with the potential package name it also saves a stat call.
Only if there is something in the directory named the same thing as
the potential package will the number of stat calls increase
(due to more wasteful __init__ checks).

Semantically there is no change as the isdir check moved
down so that namespace packages continue to have no chance of
accidentally collecting non-existent directories.

11 years agoImportant race condition fix for Tulip.
Guido van Rossum [Fri, 18 Oct 2013 17:10:36 +0000 (10:10 -0700)]
Important race condition fix for Tulip.

11 years agomerge 3.3
Benjamin Peterson [Fri, 18 Oct 2013 16:58:17 +0000 (12:58 -0400)]
merge 3.3

11 years agofix description of super() behavior on descriptors
Benjamin Peterson [Fri, 18 Oct 2013 16:57:55 +0000 (12:57 -0400)]
fix description of super() behavior on descriptors

11 years agoUpdate more configurations in pcbuild.sln.
Richard Oudkerk [Fri, 18 Oct 2013 16:04:31 +0000 (17:04 +0100)]
Update more configurations in pcbuild.sln.

11 years agoIssue #18416: Fix various os calls in importlib.machinery.FileFinder
Brett Cannon [Fri, 18 Oct 2013 16:01:06 +0000 (12:01 -0400)]
Issue #18416: Fix various os calls in importlib.machinery.FileFinder
now that self.path is no longer forced to '.'.

11 years agomerge
Brett Cannon [Fri, 18 Oct 2013 15:39:32 +0000 (11:39 -0400)]
merge

11 years agoIssue #18416: Have importlib.machinery.PathFinder treat '' as the cwd
Brett Cannon [Fri, 18 Oct 2013 15:39:04 +0000 (11:39 -0400)]
Issue #18416: Have importlib.machinery.PathFinder treat '' as the cwd
and stop importlib.machinery.FileFinder treating '' as '.'.

Previous PathFinder transformed '' into '.' which led to __file__ for
modules imported from the cwd to always be relative paths. This meant
the values of the attribute were wrong as soon as the cwd changed.
This change now means that as long as the site module is run (which
makes all entries in sys.path absolute) then all values for __file__
will also be absolute unless it's for __main__ when specified by file
path in a relative way (modules imported by runpy will have an
absolute path).

Now that PathFinder is no longer treating '' as '.' it only makes
sense for FileFinder to stop doing so as well. Now no transformation
is performed for the directory given to the __init__ method.

Thanks to Madison May for the initial patch.

11 years agoUpdate pcbuild.sln to build _overlapped.
Richard Oudkerk [Fri, 18 Oct 2013 15:23:01 +0000 (16:23 +0100)]
Update pcbuild.sln to build _overlapped.

11 years agoRename Transport.pause/resume to pause_reading/pause_writing. Also relax timeout...
Guido van Rossum [Fri, 18 Oct 2013 14:58:20 +0000 (07:58 -0700)]
Rename Transport.pause/resume to pause_reading/pause_writing. Also relax timeout in test_call_later().

11 years agoIssue #16803: test.test_importlib.test_api now runs under frozen and
Brett Cannon [Fri, 18 Oct 2013 14:45:59 +0000 (10:45 -0400)]
Issue #16803: test.test_importlib.test_api now runs under frozen and
source.

11 years agoRemove redundant empty lines.
Serhiy Storchaka [Fri, 18 Oct 2013 14:17:31 +0000 (17:17 +0300)]
Remove redundant empty lines.

11 years agoRemove redundant empty lines.
Serhiy Storchaka [Fri, 18 Oct 2013 14:16:40 +0000 (17:16 +0300)]
Remove redundant empty lines.

11 years agoRemove a duplicate.
Serhiy Storchaka [Fri, 18 Oct 2013 14:05:41 +0000 (17:05 +0300)]
Remove a duplicate.

11 years agoIssue #16129: this should appease the buildbots
Nick Coghlan [Fri, 18 Oct 2013 13:59:58 +0000 (23:59 +1000)]
Issue #16129: this should appease the buildbots

11 years agoRemove test_sigterm().
Richard Oudkerk [Fri, 18 Oct 2013 13:42:56 +0000 (14:42 +0100)]
Remove test_sigterm().

11 years agoIssue #16129: Py_SetStandardStreamEncoding cleanups
Nick Coghlan [Fri, 18 Oct 2013 13:11:47 +0000 (23:11 +1000)]
Issue #16129: Py_SetStandardStreamEncoding cleanups

- don't call PyErr_NoMemory with interpreter is not initialised
- note that it's OK to call _PyMem_RawStrDup here
- don't include this in the limited API
- capitalise "IO"
- be explicit that a non-zero return indicates an error
- include versionadded marker in docs

11 years agoClose #19284: Handle -R properly in flag helper
Nick Coghlan [Fri, 18 Oct 2013 12:39:50 +0000 (22:39 +1000)]
Close #19284: Handle -R properly in flag helper

Previously, the -R option would be specified multiple times
if PYTHONHASHSEED was set.

11 years agoFix markup.
Serhiy Storchaka [Fri, 18 Oct 2013 08:55:30 +0000 (11:55 +0300)]
Fix markup.

11 years agoFix markup.
Serhiy Storchaka [Fri, 18 Oct 2013 08:55:02 +0000 (11:55 +0300)]
Fix markup.

11 years agoIssue #19030: special-cased __dict__ as the actual dict is not returned, a proxy is.
Ethan Furman [Fri, 18 Oct 2013 08:22:08 +0000 (01:22 -0700)]
Issue #19030:  special-cased __dict__ as the actual dict is not returned, a proxy is.

11 years agoIssue #19272: slight clarification of pickle docs with regard to lambda.
Ethan Furman [Fri, 18 Oct 2013 07:45:40 +0000 (00:45 -0700)]
Issue #19272: slight clarification of pickle docs with regard to lambda.

11 years agoClose #19030: inspect.getmembers and inspect.classify_class_attrs
Ethan Furman [Fri, 18 Oct 2013 07:27:39 +0000 (00:27 -0700)]
Close #19030: inspect.getmembers and inspect.classify_class_attrs

Order of search is now:
  1. Try getattr
  2. If that throws an exception, check __dict__ directly
  3. If still not found, walk the mro looking for the eldest class that has
     the attribute (e.g. things returned by __getattr__)
  4. If none of that works (e.g. due to a buggy __dir__, __getattr__, etc.
     method or missing __slot__ attribute), ignore the attribute entirely.

11 years agoCatching up on NEWS entries.
Ethan Furman [Fri, 18 Oct 2013 02:34:12 +0000 (19:34 -0700)]
Catching up on NEWS entries.

I'll make sure and include them in future patches.

11 years agoIssue #19262: Install asyncio and test_asyncio directories.
Ned Deily [Fri, 18 Oct 2013 01:08:00 +0000 (18:08 -0700)]
Issue #19262: Install asyncio and test_asyncio directories.

11 years agoRename the logger to plain "logger".
Guido van Rossum [Thu, 17 Oct 2013 22:39:45 +0000 (15:39 -0700)]
Rename the logger to plain "logger".

11 years agoIssue #19275: Fix test_site failure on OS X due to typo.
Ned Deily [Thu, 17 Oct 2013 22:21:40 +0000 (15:21 -0700)]
Issue #19275: Fix test_site failure on OS X due to typo.

11 years agoMake asyncio tests run on Windows.
Guido van Rossum [Thu, 17 Oct 2013 21:23:17 +0000 (14:23 -0700)]
Make asyncio tests run on Windows.

11 years agoInitial checkin of asyncio package (== Tulip, == PEP 3156).
Guido van Rossum [Thu, 17 Oct 2013 20:40:50 +0000 (13:40 -0700)]
Initial checkin of asyncio package (== Tulip, == PEP 3156).

11 years agoIssue #19276: Fixed the wave module on 64-bit big-endian platforms.
Serhiy Storchaka [Thu, 17 Oct 2013 20:05:19 +0000 (23:05 +0300)]
Issue #19276: Fixed the wave module on 64-bit big-endian platforms.

11 years agoIssue #19276: Fixed the wave module on 64-bit big-endian platforms.
Serhiy Storchaka [Thu, 17 Oct 2013 20:04:04 +0000 (23:04 +0300)]
Issue #19276: Fixed the wave module on 64-bit big-endian platforms.

11 years agomerge with 3.3
Georg Brandl [Thu, 17 Oct 2013 17:52:33 +0000 (19:52 +0200)]
merge with 3.3

11 years agoFix inaccurate versionchanged tag for compressobj(): most parameter were there, just...
Georg Brandl [Thu, 17 Oct 2013 17:51:34 +0000 (19:51 +0200)]
Fix inaccurate versionchanged tag for compressobj(): most parameter were there, just got kwarg support.

11 years agoSkip #16129 test until I debug cross-platform issues
Nick Coghlan [Thu, 17 Oct 2013 15:46:19 +0000 (01:46 +1000)]
Skip #16129 test until I debug cross-platform issues

11 years agoTry to debug overspecified test :(
Nick Coghlan [Thu, 17 Oct 2013 15:44:22 +0000 (01:44 +1000)]
Try to debug overspecified test :(

11 years agoFix signal handler in test.
Richard Oudkerk [Thu, 17 Oct 2013 14:22:10 +0000 (15:22 +0100)]
Fix signal handler in test.

11 years agoClose #19266: contextlib.ignore -> contextlib.suppress
Nick Coghlan [Thu, 17 Oct 2013 13:40:57 +0000 (23:40 +1000)]
Close #19266: contextlib.ignore -> contextlib.suppress

Patch by Zero Piraeus.

11 years agoMerge.
Richard Oudkerk [Thu, 17 Oct 2013 13:31:51 +0000 (14:31 +0100)]
Merge.

11 years agoIssue #16129: Move Py_SetStandardStreamEncoding declaration
Nick Coghlan [Thu, 17 Oct 2013 13:27:17 +0000 (23:27 +1000)]
Issue #16129: Move Py_SetStandardStreamEncoding declaration

11 years agoTry doing a raw test of os.fork()/os.kill().
Richard Oudkerk [Thu, 17 Oct 2013 13:24:06 +0000 (14:24 +0100)]
Try doing a raw test of os.fork()/os.kill().

11 years agoIssue #16129: Add `Py_SetStandardStreamEncoding`
Nick Coghlan [Thu, 17 Oct 2013 12:35:35 +0000 (22:35 +1000)]
Issue #16129: Add `Py_SetStandardStreamEncoding`

This new pre-initialization API allows embedding
applications like Blender to force a particular
encoding and error handler for the standard IO streams.

Also refactors Modules/_testembed.c to let us start
testing multiple embedding scenarios.

(Initial patch by Bastien Montagne)

11 years agoStop trying to use strace, but add a sleep before terminate().
Richard Oudkerk [Thu, 17 Oct 2013 12:56:18 +0000 (13:56 +0100)]
Stop trying to use strace, but add a sleep before terminate().

11 years agoIssue #19275: Fix test_site on AMD64 Snow Leopard
Christian Heimes [Thu, 17 Oct 2013 11:40:00 +0000 (13:40 +0200)]
Issue #19275: Fix test_site on AMD64 Snow Leopard

11 years agoTry strace instead of gdb to see what wedged child is doing.
Richard Oudkerk [Thu, 17 Oct 2013 11:10:45 +0000 (12:10 +0100)]
Try strace instead of gdb to see what wedged child is doing.

11 years agoMerge heads
Serhiy Storchaka [Thu, 17 Oct 2013 09:48:32 +0000 (12:48 +0300)]
Merge heads

11 years agoIssue 19276: Fix tests for wave files on big-endian platforms.
Serhiy Storchaka [Thu, 17 Oct 2013 09:46:53 +0000 (12:46 +0300)]
Issue 19276: Fix tests for wave files on big-endian platforms.
Skip tests for 24-bit wave file on big-endian platforms.

11 years agoIssue 19276: Fix tests for wave files on big-endian platforms.
Serhiy Storchaka [Thu, 17 Oct 2013 09:46:00 +0000 (12:46 +0300)]
Issue 19276: Fix tests for wave files on big-endian platforms.
Skip tests for 24-bit wave file on big-endian platforms.

11 years agoTry to print a backtrace of wedged child process in test.
Richard Oudkerk [Thu, 17 Oct 2013 09:38:37 +0000 (10:38 +0100)]
Try to print a backtrace of wedged child process in test.

11 years ago#18891: Complete new provisional email API.
R David Murray [Thu, 17 Oct 2013 02:48:40 +0000 (22:48 -0400)]
#18891: Complete new provisional email API.

This adds EmailMessage and, MIMEPart subclasses of Message
with new API methods, and a ContentManager class used by
the new methods.  Also a new policy setting, content_manager.

Patch was reviewed by Stephen J. Turnbull and Serhiy Storchaka,
and reflects their feedback.

I will ideally add some examples of using the new API to the
documentation before the final release.

11 years agoClose #19252: better test coverage for Enum. Thanks, CliffM
Ethan Furman [Thu, 17 Oct 2013 02:09:31 +0000 (19:09 -0700)]
Close #19252: better test coverage for Enum.  Thanks, CliffM

11 years agoFix import of SimpleQueue.
Richard Oudkerk [Wed, 16 Oct 2013 16:06:22 +0000 (17:06 +0100)]
Fix import of SimpleQueue.

11 years agoIssue #18999: Make multiprocessing use context objects.
Richard Oudkerk [Wed, 16 Oct 2013 15:41:56 +0000 (16:41 +0100)]
Issue #18999: Make multiprocessing use context objects.

This allows different parts of a program to use different methods for
starting processes without interfering with each other.

11 years agoAdd shorten to __all_ (issues #18585 and #18725).
Serhiy Storchaka [Wed, 16 Oct 2013 10:07:53 +0000 (13:07 +0300)]
Add shorten to __all_ (issues #18585 and #18725).

11 years agoIssue #18468: The re.split, re.findall, and re.sub functions and the group()
Serhiy Storchaka [Wed, 16 Oct 2013 09:46:28 +0000 (12:46 +0300)]
Issue #18468: The re.split, re.findall, and re.sub functions and the group()
and groups() methods of match object now always return a string or a bytes
object.

11 years agoIssue #14407: Fix unittest test discovery in test_concurrent_futures.
Antoine Pitrou [Tue, 15 Oct 2013 21:24:44 +0000 (23:24 +0200)]
Issue #14407: Fix unittest test discovery in test_concurrent_futures.

11 years agoIssue #14407: Fix unittest test discovery in test_concurrent_futures.
Antoine Pitrou [Tue, 15 Oct 2013 21:23:32 +0000 (23:23 +0200)]
Issue #14407: Fix unittest test discovery in test_concurrent_futures.

11 years agoIssue #18725: The textwrap module now supports truncating multiline text.
Serhiy Storchaka [Tue, 15 Oct 2013 18:22:54 +0000 (21:22 +0300)]
Issue #18725: The textwrap module now supports truncating multiline text.

11 years agoMerge
Richard Oudkerk [Tue, 15 Oct 2013 15:49:59 +0000 (16:49 +0100)]
Merge

11 years agoPrint process instead of pid.
Richard Oudkerk [Tue, 15 Oct 2013 15:48:51 +0000 (16:48 +0100)]
Print process instead of pid.

11 years agoIssue #17221: Merge 3.4.0 Alpha 1 entries before and after 3.3.1 release candidate 1.
Serhiy Storchaka [Tue, 15 Oct 2013 09:05:57 +0000 (12:05 +0300)]
Issue #17221: Merge 3.4.0 Alpha 1 entries before and after 3.3.1 release candidate 1.

11 years agoClose #19260: remove outdated comment in marshal.c
Antoine Pitrou [Mon, 14 Oct 2013 18:50:32 +0000 (20:50 +0200)]
Close #19260: remove outdated comment in marshal.c

11 years agoIssue #18919: Add test/audiodata to LIBSUBDIRS.
Serhiy Storchaka [Mon, 14 Oct 2013 18:19:24 +0000 (21:19 +0300)]
Issue #18919: Add test/audiodata to LIBSUBDIRS.

11 years agoIssue #18919: Add test/audiodata to LIBSUBDIRS.
Serhiy Storchaka [Mon, 14 Oct 2013 18:18:50 +0000 (21:18 +0300)]
Issue #18919: Add test/audiodata to LIBSUBDIRS.

11 years agoIssue #18919: Fixed resource leaks in audio tests.
Serhiy Storchaka [Mon, 14 Oct 2013 17:10:18 +0000 (20:10 +0300)]
Issue #18919: Fixed resource leaks in audio tests.

11 years agoIssue #18919: Fixed resource leaks in audio tests.
Serhiy Storchaka [Mon, 14 Oct 2013 17:09:47 +0000 (20:09 +0300)]
Issue #18919: Fixed resource leaks in audio tests.

11 years agoIssue #18919: Check warnings messages in the aifc module tests.
Serhiy Storchaka [Mon, 14 Oct 2013 17:06:04 +0000 (20:06 +0300)]
Issue #18919: Check warnings messages in the aifc module tests.

11 years agoIssue #18919: Check warnings messages in the aifc module tests.
Serhiy Storchaka [Mon, 14 Oct 2013 17:05:33 +0000 (20:05 +0300)]
Issue #18919: Check warnings messages in the aifc module tests.

11 years agomerge with 3.3
Georg Brandl [Mon, 14 Oct 2013 14:53:07 +0000 (16:53 +0200)]
merge with 3.3

11 years agoCloses #19258: close WSGI server after handling request in demo code.
Georg Brandl [Mon, 14 Oct 2013 14:52:13 +0000 (16:52 +0200)]
Closes #19258: close WSGI server after handling request in demo code.

11 years agomerge with 3.3
Georg Brandl [Mon, 14 Oct 2013 14:08:25 +0000 (16:08 +0200)]
merge with 3.3

11 years agoCloses #17154: error out gracefully on "ignore" or "condition" without argument.
Georg Brandl [Mon, 14 Oct 2013 14:08:15 +0000 (16:08 +0200)]
Closes #17154: error out gracefully on "ignore" or "condition" without argument.

11 years agoIssue #19189: Improved cross-references in the pickle module documentation.
Serhiy Storchaka [Mon, 14 Oct 2013 07:44:25 +0000 (10:44 +0300)]
Issue #19189: Improved cross-references in the pickle module documentation.

11 years agoIssue #19189: Improved cross-references in the pickle module documentation.
Serhiy Storchaka [Mon, 14 Oct 2013 07:43:46 +0000 (10:43 +0300)]
Issue #19189: Improved cross-references in the pickle module documentation.

11 years agoRe #18521: move array bounds check before array access.
Georg Brandl [Mon, 14 Oct 2013 05:01:11 +0000 (07:01 +0200)]
Re #18521: move array bounds check before array access.

11 years agoRe #18521: remove assignments of variables that are immediately reassigned.
Georg Brandl [Mon, 14 Oct 2013 04:51:46 +0000 (06:51 +0200)]
Re #18521: remove assignments of variables that are immediately reassigned.

11 years agoRe #18521: fix not-quite-C syntax that works only because the PyXXX_Check are macros...
Georg Brandl [Mon, 14 Oct 2013 04:46:12 +0000 (06:46 +0200)]
Re #18521: fix not-quite-C syntax that works only because the PyXXX_Check are macros defined with () around them.

11 years ago#4965: merge with 3.3.
Ezio Melotti [Sun, 13 Oct 2013 23:59:54 +0000 (02:59 +0300)]
#4965: merge with 3.3.

11 years ago#4965: Implement intelligent scrolling of the sidebar in the docs.
Ezio Melotti [Sun, 13 Oct 2013 23:58:59 +0000 (02:58 +0300)]
#4965: Implement intelligent scrolling of the sidebar in the docs.

11 years agomerge with 3.3
Georg Brandl [Sun, 13 Oct 2013 21:34:06 +0000 (23:34 +0200)]
merge with 3.3

11 years agoCloses #16657: fix docstring of traceback.format_tb().
Georg Brandl [Sun, 13 Oct 2013 21:32:14 +0000 (23:32 +0200)]
Closes #16657: fix docstring of traceback.format_tb().

11 years agoNull merge
Serhiy Storchaka [Sun, 13 Oct 2013 20:30:53 +0000 (23:30 +0300)]
Null merge