diff options
| author | Facundo Batista <facundobatista@gmail.com> | 2008-06-21 17:43:56 (GMT) |
|---|---|---|
| committer | Facundo Batista <facundobatista@gmail.com> | 2008-06-21 17:43:56 (GMT) |
| commit | 2da91c375b095a452dd1e81962983e89e3fd0d07 (patch) | |
| tree | 833230da7671d829dd39742984e524bf046eba10 | |
| parent | 8e1c52ac0e551505f0edb4aad2774c37e1d93ea5 (diff) | |
| download | cpython-2da91c375b095a452dd1e81962983e89e3fd0d07.zip cpython-2da91c375b095a452dd1e81962983e89e3fd0d07.tar.gz cpython-2da91c375b095a452dd1e81962983e89e3fd0d07.tar.bz2 | |
Fixed issue #2888. Now the behaviour of pprint when working with nested
structures follows the common sense (and works like in 2.5 and 3.0).
| -rw-r--r-- | Doc/library/pprint.rst | 2 | ||||
| -rw-r--r-- | Lib/pprint.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_pprint.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
4 files changed, 17 insertions, 2 deletions
diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst index c0bedf5..7bcb3f1 100644 --- a/Doc/library/pprint.rst +++ b/Doc/library/pprint.rst @@ -56,7 +56,7 @@ The :mod:`pprint` module defines one class: >>> stuff.insert(0, stuff[:]) >>> pp = pprint.PrettyPrinter(indent=4) >>> pp.pprint(stuff) - [ [ 'spam', 'eggs', 'lumberjack', 'knights', 'ni'], + [ ['spam', 'eggs', 'lumberjack', 'knights', 'ni'], 'spam', 'eggs', 'lumberjack', diff --git a/Lib/pprint.py b/Lib/pprint.py index 93d850a..c48465b 100644 --- a/Lib/pprint.py +++ b/Lib/pprint.py @@ -194,7 +194,7 @@ class PrettyPrinter: else: write('(') endchar = ')' - if self._indent_per_level > 1: + if self._indent_per_level > 1 and sepLines: write((self._indent_per_level - 1) * ' ') if length: context[objid] = 1 diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py index 4d7a3ed..439f605 100644 --- a/Lib/test/test_pprint.py +++ b/Lib/test/test_pprint.py @@ -170,6 +170,17 @@ class QueryTestCase(unittest.TestCase): for type in [list, list2]: self.assertEqual(pprint.pformat(type(o), indent=4), exp) + def test_nested_indentations(self): + o1 = list(range(10)) + o2 = dict(first=1, second=2, third=3) + o = [o1, o2] + expected = """\ +[ [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], + { 'first': 1, + 'second': 2, + 'third': 3}]""" + self.assertEqual(pprint.pformat(o, indent=4, width=42), expected) + def test_sorted_dict(self): # Starting in Python 2.5, pprint sorts dict displays by key regardless # of how small the dictionary may be. @@ -108,6 +108,10 @@ Extension Modules Library ------- +- Issue #2888: Fixed the behaviour of pprint when working with nested + structures, to match the behaviour of 2.5 and 3.0 (now follows the common + sense). + - Issue #3136: fileConfig()'s disabling of old loggers is now conditional via an optional disable_existing_loggers parameter, but the default value is such that the old behaviour is preserved. Thanks to Leandro Lucarella for |