]> granicus.if.org Git - python/log
python
9 years agoMerge with 3.4
Terry Jan Reedy [Thu, 12 Nov 2015 20:03:17 +0000 (15:03 -0500)]
Merge with 3.4

9 years agoIssue #25313: Change the handling of new built-in text color themes to better
Terry Jan Reedy [Thu, 12 Nov 2015 20:02:57 +0000 (15:02 -0500)]
Issue #25313: Change the handling of new built-in text color themes to better
address the compatibility problem introduced by the addition of IDLE Dark.
Consistently use the revised idleConf.CurrentTheme everywhere in idlelib.

9 years agoIssue #25607: Restore old distutils logging threshold after running tests that
Serhiy Storchaka [Thu, 12 Nov 2015 17:47:14 +0000 (19:47 +0200)]
Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.

9 years agoIssue #25607: Restore old distutils logging threshold after running tests that
Serhiy Storchaka [Thu, 12 Nov 2015 17:46:23 +0000 (19:46 +0200)]
Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.

9 years agoRestore old distutils logging threshold after running test_log.
Serhiy Storchaka [Thu, 12 Nov 2015 11:15:56 +0000 (13:15 +0200)]
Restore old distutils logging threshold after running test_log.

9 years agoRestore old distutils logging threshold after running test_log.
Serhiy Storchaka [Thu, 12 Nov 2015 11:15:41 +0000 (13:15 +0200)]
Restore old distutils logging threshold after running test_log.

9 years agoIssue #22995: Default implementation of __reduce__ and __reduce_ex__ now
Serhiy Storchaka [Thu, 12 Nov 2015 09:31:51 +0000 (11:31 +0200)]
Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
rejects builtin types with not defined __new__.
Added tests for non-pickleable types.

9 years agoIssue #22995: Default implementation of __reduce__ and __reduce_ex__ now
Serhiy Storchaka [Thu, 12 Nov 2015 09:23:04 +0000 (11:23 +0200)]
Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
rejects builtin types with not defined __new__.
Added tests for non-pickleable types.

9 years agomerge 3.4 (#25530)
Benjamin Peterson [Thu, 12 Nov 2015 06:45:22 +0000 (22:45 -0800)]
merge 3.4 (#25530)

9 years agoalways set OP_NO_SSLv3 by default (closes #25530)
Benjamin Peterson [Thu, 12 Nov 2015 06:38:41 +0000 (22:38 -0800)]
always set OP_NO_SSLv3 by default (closes #25530)

9 years agomerge 3.5 (#25569)
Benjamin Peterson [Thu, 12 Nov 2015 06:14:08 +0000 (22:14 -0800)]
merge 3.5 (#25569)

9 years agofix memory leak in _get_crl_dp (closes #25569)
Benjamin Peterson [Thu, 12 Nov 2015 06:07:38 +0000 (22:07 -0800)]
fix memory leak in _get_crl_dp (closes #25569)

Patch started by Stéphane Wirtel.

9 years agoMerge with 3.4
Zachary Ware [Thu, 12 Nov 2015 05:33:50 +0000 (23:33 -0600)]
Merge with 3.4

9 years agoRewrite re.VERBOSE section.
Zachary Ware [Thu, 12 Nov 2015 05:32:14 +0000 (23:32 -0600)]
Rewrite re.VERBOSE section.

It now has slightly better rationale and a less awkward wording in the
explanation.

Inspired by a report of a neither/or conflict by 'animalize' on docs@.

9 years agoIssue #25603: Add missing parenthesis.
Zachary Ware [Thu, 12 Nov 2015 04:59:44 +0000 (22:59 -0600)]
Issue #25603: Add missing parenthesis.

9 years agoFix awkward grammar in whatsnew.
Zachary Ware [Thu, 12 Nov 2015 04:53:47 +0000 (22:53 -0600)]
Fix awkward grammar in whatsnew.

Reported on docs@ by Keith Briggs.

9 years agoIssue #25595: Fixed test_deleted_cwd in test_importlib on AIX.
Serhiy Storchaka [Wed, 11 Nov 2015 06:26:59 +0000 (08:26 +0200)]
Issue #25595: Fixed test_deleted_cwd in test_importlib on AIX.

9 years agoIssue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Serhiy Storchaka [Tue, 10 Nov 2015 17:51:56 +0000 (19:51 +0200)]
Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Use time.monotonic instead of time.clock.

9 years agoIssue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Serhiy Storchaka [Tue, 10 Nov 2015 17:50:14 +0000 (19:50 +0200)]
Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Use time.monotonic or time.time instead of time.clock.

9 years agoFix Visual Studio warning.
Stefan Krah [Tue, 10 Nov 2015 17:35:19 +0000 (18:35 +0100)]
Fix Visual Studio warning.

9 years agoIaaue #25598: Fix memory_hex from #9951 for non-contiguous buffers.
Stefan Krah [Tue, 10 Nov 2015 17:17:22 +0000 (18:17 +0100)]
Iaaue #25598: Fix memory_hex from #9951 for non-contiguous buffers.

9 years agoIssue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
Serhiy Storchaka [Tue, 10 Nov 2015 13:31:38 +0000 (15:31 +0200)]
Issue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
failure when the test is ran the second time.

The root attribute was set in parent class in setUpClass and then
overridded in child class in tearDownClass.

9 years agoIssue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
Serhiy Storchaka [Tue, 10 Nov 2015 13:30:35 +0000 (15:30 +0200)]
Issue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
failure when the test is ran the second time.

The root attribute was set in parent class in setUpClass and then
overridded in child class in tearDownClass.

9 years agopytime.c: rename pygettimeofday_new() to pygettimeofday()
Victor Stinner [Tue, 10 Nov 2015 11:11:39 +0000 (12:11 +0100)]
pytime.c: rename pygettimeofday_new() to pygettimeofday()

I forgot to rename it in my previous refactoring of pytime.c.

9 years agoImprove appearance of example code
Raymond Hettinger [Tue, 10 Nov 2015 08:09:34 +0000 (00:09 -0800)]
Improve appearance of example code

9 years agoRemove confusing section from named tuple recipes.
Raymond Hettinger [Tue, 10 Nov 2015 08:00:00 +0000 (00:00 -0800)]
Remove confusing section from named tuple recipes.

9 years agoAdded missed periods at the ends of sentences in Misc/NEWS.
Serhiy Storchaka [Mon, 9 Nov 2015 22:31:10 +0000 (00:31 +0200)]
Added missed periods at the ends of sentences in Misc/NEWS.

9 years agoAdded missed periods at the ends of sentences in Misc/NEWS.
Serhiy Storchaka [Mon, 9 Nov 2015 22:20:43 +0000 (00:20 +0200)]
Added missed periods at the ends of sentences in Misc/NEWS.

9 years agoFixed markup in Misc/NEWS.
Serhiy Storchaka [Mon, 9 Nov 2015 21:43:56 +0000 (23:43 +0200)]
Fixed markup in Misc/NEWS.

9 years agoFixed markup in Misc/NEWS.
Serhiy Storchaka [Mon, 9 Nov 2015 21:41:39 +0000 (23:41 +0200)]
Fixed markup in Misc/NEWS.

9 years agoIssue #25584: Added "escape" to the __all__ list in the glob module.
Serhiy Storchaka [Mon, 9 Nov 2015 21:18:19 +0000 (23:18 +0200)]
Issue #25584: Added "escape" to the __all__ list in the glob module.
From patch by Xavier de Gaye.

9 years agoIssue #25584: Fixed recursive glob() with patterns starting with '**'.
Serhiy Storchaka [Mon, 9 Nov 2015 21:12:07 +0000 (23:12 +0200)]
Issue #25584: Fixed recursive glob() with patterns starting with '**'.

9 years agoIssue #25582: Fixed 100 MB memory leak in test_ctypes.
Serhiy Storchaka [Mon, 9 Nov 2015 20:31:10 +0000 (22:31 +0200)]
Issue #25582: Fixed 100 MB memory leak in test_ctypes.

9 years agoIssue #24306: Sets component ID for launcher to match 3.5 and later to avoid downgrading.
Steve Dower [Sat, 7 Nov 2015 18:07:04 +0000 (10:07 -0800)]
Issue #24306: Sets component ID for launcher to match 3.5 and later to avoid downgrading.

9 years agoIssue #22643: Skip test_case_operation_overflow on computers with low memory.
Serhiy Storchaka [Sat, 7 Nov 2015 14:54:48 +0000 (16:54 +0200)]
Issue #22643: Skip test_case_operation_overflow on computers with low memory.

9 years agoIssue #892902: Added new tests for pickling recursive collections.
Serhiy Storchaka [Sat, 7 Nov 2015 09:16:10 +0000 (11:16 +0200)]
Issue #892902: Added new tests for pickling recursive collections.

9 years agoIssue #24802: Copy bytes-like objects to null-terminated buffers if necessary
Martin Panter [Sat, 7 Nov 2015 02:32:21 +0000 (02:32 +0000)]
Issue #24802: Copy bytes-like objects to null-terminated buffers if necessary

This avoids possible buffer overreads when int(), float(), compile(), exec()
and eval() are passed bytes-like objects. Similar code is removed from the
complex() constructor, where it was not reachable.

Patch by John Leitch, Serhiy Storchaka and Martin Panter.

9 years agoIssue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node when
Victor Stinner [Fri, 6 Nov 2015 16:01:48 +0000 (17:01 +0100)]
Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node when
compiling AST from Python objects.

9 years agoIssue #25582: Fixed 100 MB memory leak in test_ctypes.
Serhiy Storchaka [Mon, 9 Nov 2015 20:32:23 +0000 (22:32 +0200)]
Issue #25582: Fixed 100 MB memory leak in test_ctypes.

9 years agoImprove namedtuple doc string examples
Raymond Hettinger [Mon, 9 Nov 2015 16:24:53 +0000 (08:24 -0800)]
Improve namedtuple doc string examples

9 years agoFixes installer not allowing launcher to be selected.
Steve Dower [Mon, 9 Nov 2015 12:31:05 +0000 (07:31 -0500)]
Fixes installer not allowing launcher to be selected.

9 years agoIssue #24802: Update test case for ValueError in 3.5
Martin Panter [Sun, 8 Nov 2015 11:09:13 +0000 (11:09 +0000)]
Issue #24802: Update test case for ValueError in 3.5

9 years ago#25446: Fix regression in smtplib's AUTH LOGIN support.
R David Murray [Sun, 8 Nov 2015 06:03:52 +0000 (01:03 -0500)]
#25446: Fix regression in smtplib's AUTH LOGIN support.

The auth method tests simply weren't adequate because of the fact that
smtpd doesn't support authentication.  I borrowed some of Milan's
code for that from issue #21935 and added it to the smtplib tests.
Also discovered that the direct test for the 'auth' method wasn't actually
testing anything and fixed it.

The fix makes the new authobject mechanism work the way it is
documented...the problem was that wasn't checking for a 334 return code
if an initial-response was provided, which works fine for auth plain
and cram-md5, but not for auth login.

9 years agoNull merge from 3.4
Steve Dower [Sat, 7 Nov 2015 18:08:04 +0000 (10:08 -0800)]
Null merge from 3.4

9 years agoIssue #22643: Skip test_case_operation_overflow on computers with low memory.
Serhiy Storchaka [Sat, 7 Nov 2015 14:55:16 +0000 (16:55 +0200)]
Issue #22643: Skip test_case_operation_overflow on computers with low memory.

9 years agoIssue #892902: Added new tests for pickling recursive collections.
Serhiy Storchaka [Sat, 7 Nov 2015 09:17:02 +0000 (11:17 +0200)]
Issue #892902: Added new tests for pickling recursive collections.

9 years agoIssue #24802: Merge null termination fixes from 3.4 into 3.5
Martin Panter [Sat, 7 Nov 2015 02:56:11 +0000 (02:56 +0000)]
Issue #24802: Merge null termination fixes from 3.4 into 3.5

9 years agoIssue #25064: Adjust documentation according to new mkstemp signature
Martin Panter [Sat, 7 Nov 2015 00:32:50 +0000 (00:32 +0000)]
Issue #25064: Adjust documentation according to new mkstemp signature

The mkstemp() and mkdtemp() signatures have already been updated, but the
higher-level functions still suggest that the default values are forced to
text strings. Also merged some paragraphs describing the "suffix" and
"prefix" parameters, and pointed out that mktemp() does not support the new
changes.

9 years agoIssue #25410: Made testing that od_fast_nodes and dk_entries are in sync more
Serhiy Storchaka [Fri, 6 Nov 2015 10:00:03 +0000 (12:00 +0200)]
Issue #25410: Made testing that od_fast_nodes and dk_entries are in sync more
reliable.

9 years agoFixed merging error in 3ebeeed1eb28.
Serhiy Storchaka [Fri, 6 Nov 2015 09:19:42 +0000 (11:19 +0200)]
Fixed merging error in 3ebeeed1eb28.
Thanks Марк Коренберг.

9 years agoIssue #24726: Revert setting the value on the dict if
Serhiy Storchaka [Fri, 6 Nov 2015 09:07:11 +0000 (11:07 +0200)]
Issue #24726: Revert setting the value on the dict if
_odict_add_new_node() fails.

9 years agoIssue #25558: Refactoring OrderedDict iteration.
Serhiy Storchaka [Fri, 6 Nov 2015 08:39:51 +0000 (10:39 +0200)]
Issue #25558: Refactoring OrderedDict iteration.

9 years agoIssue #18010: Merge pydoc web search fix from 3.4 into 3.5
Martin Panter [Fri, 6 Nov 2015 00:51:38 +0000 (00:51 +0000)]
Issue #18010: Merge pydoc web search fix from 3.4 into 3.5

9 years agoIssue #18010: Fix pydoc web server search to handle package exceptions
Martin Panter [Fri, 6 Nov 2015 00:27:14 +0000 (00:27 +0000)]
Issue #18010: Fix pydoc web server search to handle package exceptions

Implementation by Antoine Pitrou.

9 years agoMerge 3.4
Yury Selivanov [Thu, 5 Nov 2015 19:29:19 +0000 (14:29 -0500)]
Merge 3.4

9 years agoasyncio: Optimize asyncio.sleep(0)
Yury Selivanov [Thu, 5 Nov 2015 19:29:04 +0000 (14:29 -0500)]
asyncio: Optimize asyncio.sleep(0)

9 years agoIssue #25554: Got rid of circular references in regular expression parsing.
Serhiy Storchaka [Thu, 5 Nov 2015 15:49:26 +0000 (17:49 +0200)]
Issue #25554: Got rid of circular references in regular expression parsing.

9 years agoIssue #25556: Fix LOAD_GLOBAL bytecode when globals type is not dict and the
Victor Stinner [Thu, 5 Nov 2015 12:55:20 +0000 (13:55 +0100)]
Issue #25556: Fix LOAD_GLOBAL bytecode when globals type is not dict and the
requested name doesn't exist in globals: clear the KeyError exception before
calling PyObject_GetItem(). Fail also if the raised exception is not a
KeyError.

9 years agoIssue #24726: Fixed issue number for previous changeset 59c7615ea921.
Serhiy Storchaka [Wed, 4 Nov 2015 20:37:46 +0000 (22:37 +0200)]
Issue #24726: Fixed issue number for previous changeset 59c7615ea921.

9 years agoIssue #25449: Fixed a crash and leaking NULL in repr() of OrderedDict that
Serhiy Storchaka [Wed, 4 Nov 2015 20:33:07 +0000 (22:33 +0200)]
Issue #25449: Fixed a crash and leaking NULL in repr() of OrderedDict that
was mutated by direct calls of dict methods.

9 years agoIssue #25449: Iterating OrderedDict with keys with unstable hash now raises
Serhiy Storchaka [Wed, 4 Nov 2015 20:05:38 +0000 (22:05 +0200)]
Issue #25449: Iterating OrderedDict with keys with unstable hash now raises
KeyError in C implementations as well as in Python implementation.

Added tests for OrderedDict subclasses.

9 years agomerge 3.4
Benjamin Peterson [Wed, 4 Nov 2015 06:43:41 +0000 (22:43 -0800)]
merge 3.4

9 years agoremove trailing ws
Benjamin Peterson [Wed, 4 Nov 2015 06:43:31 +0000 (22:43 -0800)]
remove trailing ws

9 years agomerge 3.4
Benjamin Peterson [Wed, 4 Nov 2015 06:42:35 +0000 (22:42 -0800)]
merge 3.4

9 years agolink to modern PUG url
Benjamin Peterson [Wed, 4 Nov 2015 06:42:02 +0000 (22:42 -0800)]
link to modern PUG url

9 years agoUse sys.platform instead of os.name to detect Windows in asyncio docs. Patch by Akira...
Guido van Rossum [Mon, 2 Nov 2015 17:16:37 +0000 (09:16 -0800)]
Use sys.platform instead of os.name to detect Windows in asyncio docs. Patch by Akira Li. (Merge 3.4->3.5)

9 years agoUse sys.platform instead of os.name to detect Windows in asyncio docs. Patch by Akira Li.
Guido van Rossum [Mon, 2 Nov 2015 17:15:47 +0000 (09:15 -0800)]
Use sys.platform instead of os.name to detect Windows in asyncio docs. Patch by Akira Li.

9 years agoIssue #25523: Further a-to-an corrections new in 3.5.
Serhiy Storchaka [Mon, 2 Nov 2015 12:40:41 +0000 (14:40 +0200)]
Issue #25523: Further a-to-an corrections new in 3.5.

9 years agoIssue #25523: Merge a-to-an corrections from 3.4.
Serhiy Storchaka [Mon, 2 Nov 2015 12:39:05 +0000 (14:39 +0200)]
Issue #25523: Merge a-to-an corrections from 3.4.

9 years agoIssue #25523: Further a-to-an corrections.
Serhiy Storchaka [Mon, 2 Nov 2015 12:10:23 +0000 (14:10 +0200)]
Issue #25523: Further a-to-an corrections.

9 years agoIssue #25523: Further a-to-an corrections new in 3.5
Martin Panter [Mon, 2 Nov 2015 04:20:33 +0000 (04:20 +0000)]
Issue #25523: Further a-to-an corrections new in 3.5

9 years agoIssue #25523: Merge "a" to "an" fixes from 3.4 into 3.5
Martin Panter [Mon, 2 Nov 2015 04:04:57 +0000 (04:04 +0000)]
Issue #25523: Merge "a" to "an" fixes from 3.4 into 3.5

9 years agoIssue #25523: Correct "a" article to "an" article
Martin Panter [Mon, 2 Nov 2015 03:37:02 +0000 (03:37 +0000)]
Issue #25523: Correct "a" article to "an" article

This changes the main documentation, doc strings, source code comments, and a
couple error messages in the test suite. In some cases the word was removed
or edited some other way to fix the grammar.

9 years agoIssue #25510: fileinput.FileInput.readline() now returns b'' instead of ''
Serhiy Storchaka [Sun, 1 Nov 2015 14:45:26 +0000 (16:45 +0200)]
Issue #25510: fileinput.FileInput.readline() now returns b'' instead of ''
at the end if the FileInput was opened with binary mode.
Patch by Ryosuke Ito.

9 years agoIssue #25510: fileinput.FileInput.readline() now returns b'' instead of ''
Serhiy Storchaka [Sun, 1 Nov 2015 14:43:58 +0000 (16:43 +0200)]
Issue #25510: fileinput.FileInput.readline() now returns b'' instead of ''
at the end if the FileInput was opened with binary mode.
Patch by Ryosuke Ito.

9 years agoIssue #25395: Fixed crash when highly nested OrderedDict structures were
Serhiy Storchaka [Sun, 1 Nov 2015 14:12:34 +0000 (16:12 +0200)]
Issue #25395: Fixed crash when highly nested OrderedDict structures were
garbage collected.

9 years agoFix typo noticed by Alec Nunn
Berker Peksag [Sat, 31 Oct 2015 21:55:12 +0000 (00:55 +0300)]
Fix typo noticed by Alec Nunn

9 years agoIssue #25450: Updates shortcuts to start Python in installation directory.
Steve Dower [Sat, 31 Oct 2015 19:41:46 +0000 (12:41 -0700)]
Issue #25450: Updates shortcuts to start Python in installation directory.

9 years agoImproves handling of test markers for building Python without intefering with actual...
Steve Dower [Sat, 31 Oct 2015 19:17:11 +0000 (12:17 -0700)]
Improves handling of test markers for building Python without intefering with actual installs.

9 years agowhatsnew/3.5: NumPy 1.10 has been released
Yury Selivanov [Sat, 31 Oct 2015 17:33:49 +0000 (13:33 -0400)]
whatsnew/3.5: NumPy 1.10 has been released

9 years agodocs/inspect: Document __annotations__
Yury Selivanov [Sat, 31 Oct 2015 17:29:15 +0000 (13:29 -0400)]
docs/inspect: Document __annotations__

9 years agoFix more typos in whatsnew/3.5.rst
Martin Panter [Sat, 31 Oct 2015 12:18:10 +0000 (12:18 +0000)]
Fix more typos in whatsnew/3.5.rst

9 years agoMerge spelling fixes from 3.4 into 3.5
Martin Panter [Sat, 31 Oct 2015 12:16:18 +0000 (12:16 +0000)]
Merge spelling fixes from 3.4 into 3.5

9 years agoFix some spelling errors in documentation and code comments
Martin Panter [Sat, 31 Oct 2015 11:48:53 +0000 (11:48 +0000)]
Fix some spelling errors in documentation and code comments

9 years agoMerge with 3.4
Terry Jan Reedy [Fri, 30 Oct 2015 23:41:28 +0000 (19:41 -0400)]
Merge with 3.4

9 years agoIssue #25519: Mark difflib.ndiff as a functions where not already.
Terry Jan Reedy [Fri, 30 Oct 2015 23:41:16 +0000 (19:41 -0400)]
Issue #25519: Mark difflib.ndiff as a functions where not already.

9 years agoMerge with 3.4
Terry Jan Reedy [Fri, 30 Oct 2015 23:25:50 +0000 (19:25 -0400)]
Merge with 3.4

9 years agoIssue #25505: Remove unused buggy method.
Terry Jan Reedy [Fri, 30 Oct 2015 23:25:34 +0000 (19:25 -0400)]
Issue #25505: Remove unused buggy method.

9 years agoMerge with 3.4
Terry Jan Reedy [Fri, 30 Oct 2015 06:47:33 +0000 (02:47 -0400)]
Merge with 3.4

9 years agoIssue #25507: move test-specific imports to test function (idlelib.IOBinding).
Terry Jan Reedy [Fri, 30 Oct 2015 06:47:06 +0000 (02:47 -0400)]
Issue #25507: move test-specific imports to test function (idlelib.IOBinding).

9 years agomerge 3.4 (#25504)
Benjamin Peterson [Fri, 30 Oct 2015 04:11:22 +0000 (21:11 -0700)]
merge 3.4 (#25504)

9 years agofix usage of undefined name (#25504)
Benjamin Peterson [Fri, 30 Oct 2015 04:10:57 +0000 (21:10 -0700)]
fix usage of undefined name (#25504)

9 years agoalways use os.urandom for the uuid4 algorithm (closes #25515)
Benjamin Peterson [Fri, 30 Oct 2015 03:38:04 +0000 (20:38 -0700)]
always use os.urandom for the uuid4 algorithm (closes #25515)

9 years agoIssue25506: Fixed a copy-pasting error in test_pprint.
Serhiy Storchaka [Thu, 29 Oct 2015 07:52:20 +0000 (09:52 +0200)]
Issue25506: Fixed a copy-pasting error in test_pprint.
Patch by John Mark Vandenberg.

9 years agoMerge heads
Serhiy Storchaka [Thu, 29 Oct 2015 06:19:22 +0000 (08:19 +0200)]
Merge heads

9 years agoIssue #25503: Fixed inspect.getdoc() for inherited docstrings of properties.
Serhiy Storchaka [Thu, 29 Oct 2015 06:15:50 +0000 (08:15 +0200)]
Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties.
Original patch by John Mark Vandenberg.

9 years agoremove duplicated imports (closes #25502)
Benjamin Peterson [Thu, 29 Oct 2015 06:15:13 +0000 (23:15 -0700)]
remove duplicated imports (closes #25502)

9 years agoIssue #21827: Fixed textwrap.dedent() for the case when largest common
Serhiy Storchaka [Wed, 28 Oct 2015 19:43:12 +0000 (21:43 +0200)]
Issue #21827: Fixed textwrap.dedent() for the case when largest common
whitespace is a substring of smallest leading whitespace.
Based on patch by Robert Li.

9 years agoIssue #21827: Fixed textwrap.dedent() for the case when largest common
Serhiy Storchaka [Wed, 28 Oct 2015 19:39:36 +0000 (21:39 +0200)]
Issue #21827: Fixed textwrap.dedent() for the case when largest common
whitespace is a substring of smallest leading whitespace.
Based on patch by Robert Li.

9 years agoMerge with 3.4
Terry Jan Reedy [Wed, 28 Oct 2015 07:15:20 +0000 (03:15 -0400)]
Merge with 3.4