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.
........

diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst
index 940e4c4b0c860df7828a38e78c6cb083b932347d..dd85746ac4a1cb2465d0fe9bd4b1d58af2f29289 100644 (file)
--- a/Doc/library/pprint.rst
+++ b/Doc/library/pprint.rst
@@ -50,7 +50,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/test/test_pprint.py b/Lib/test/test_pprint.py
index 54c0c576069dfa1e85e207385bfe4026a215401e..f9b679e6677b40e913786ec385de66094f5dd1ba 100644 (file)
--- 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.

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index d12adccbdb117ccca733dd0c8dd9ca2d986090cc..8fcd8df71727a0ea58d6fcd5d35817a014c3bff5 100644 (file)
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -112,7 +112,7 @@ altinstallunixtools:
                $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
        fi
        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 \
                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
        done

diff --git a/PCbuild/_ctypes.vcproj b/PCbuild/_ctypes.vcproj
index d654a9be8e763601f6c88ef9146978e67e059029..b6abbe05ec7641fbeb051b0868afa0fe894edcd5 100644 (file)
--- a/PCbuild/_ctypes.vcproj
+++ b/PCbuild/_ctypes.vcproj
@@ -642,7 +642,7 @@
                                        >
                                        <Tool
                                                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"
                                        />
                                </FileConfiguration>