mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 02:15:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 64446,64490,64495,64526,64567 via svnmerge from

Browse Source 
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.
........
This commit is contained in:
Georg Brandl 2008-07-16 03:00:45 +00:00
parent b6531d26d7
commit 3ccb787241
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/pprint.rst
View File

@ -50,7 +50,7 @@ The :mod:`pprint` module defines one class:
>>> stuff.insert(0, stuff[:]) >>> stuff.insert(0, stuff[:])
>>> pp = pprint.PrettyPrinter(indent=4) >>> pp = pprint.PrettyPrinter(indent=4)
>>> pp.pprint(stuff) >>> pp.pprint(stuff)
[ [ 'spam', 'eggs', 'lumberjack', 'knights', 'ni'], [ ['spam', 'eggs', 'lumberjack', 'knights', 'ni'],
'spam', 'spam',
'eggs', 'eggs',
'lumberjack', 'lumberjack',

11
Lib/test/test_pprint.py
View File

@ -164,6 +164,17 @@ class QueryTestCase(unittest.TestCase):
for type in [list, list2]: for type in [list, list2]:
self.assertEqual(pprint.pformat(type(o), indent=4), exp) 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): def test_sorted_dict(self):
# Starting in Python 2.5, pprint sorts dict displays by key regardless # Starting in Python 2.5, pprint sorts dict displays by key regardless
# of how small the dictionary may be. # of how small the dictionary may be.

2
Mac/Makefile.in
View File

@ -112,7 +112,7 @@ altinstallunixtools:
$(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\ $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
fi fi
for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
pydoc$(VERSION) python$(VERSION)-config) smtpd$(VERSION).py ;\ pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py ;\
do \ do \
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
done done

2
PCbuild/_ctypes.vcproj
View File

@ -642,7 +642,7 @@
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="ml64 /nologo /c /Zi /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\win64.obj" Outputs="$(IntDir)\win64.obj"
/> />
</FileConfiguration> </FileConfiguration>