From 3ccb78724127e3501067e8693fa15807e2777e9c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Wed, 16 Jul 2008 03:00:45 +0000 Subject: Merged revisions 64446,64490,64495,64526,64567 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r64446 | facundo.batista | 2008-06-21 19:43:56 +0200 (Sat, 21 Jun 2008) | 4 lines 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). ........ r64490 | thomas.heller | 2008-06-23 21:51:41 +0200 (Mon, 23 Jun 2008) | 1 line Include debug info when assembling win64.asm in a debug build. ........ r64495 | benjamin.peterson | 2008-06-24 04:41:08 +0200 (Tue, 24 Jun 2008) | 1 line minor fix ........ r64526 | mark.dickinson | 2008-06-25 17:29:32 +0200 (Wed, 25 Jun 2008) | 2 lines issue #3199: Fix typo in Mac/Makefile.in ........ r64567 | mark.dickinson | 2008-06-28 00:20:14 +0200 (Sat, 28 Jun 2008) | 3 lines Fix typo in configure.in, and propagate configure.in changes from r64002 to configure and pyconfig.h.in. ........ --- Lib/test/test_pprint.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Lib/test/test_pprint.py') diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py index 54c0c57606..f9b679e667 100644 --- a/Lib/test/test_pprint.py +++ b/Lib/test/test_pprint.py @@ -164,6 +164,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. -- cgit v1.2.1