Merged revisions 76684 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76684 | tarek.ziade | 2009-12-06 10:22:40 +0100 (Sun, 06 Dec 2009) | 1 line

  Fixed #1923: make sure we don't strip meaningful whitespace in PKG-INFO Description field
........

diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py
index bf59c418442c2193717971dbe1f9128e1fbb8e23..af40186315ba9acfb056dfbc77082d607fd85c8b 100644 (file)
--- a/Lib/distutils/tests/test_dist.py
+++ b/Lib/distutils/tests/test_dist.py
@@ -9,6 +9,7 @@ import StringIO
 import sys
 import unittest
 import warnings
+import textwrap
 
 from test.test_support import TESTFN
 
@@ -283,6 +284,21 @@ class MetadataTestCase(unittest.TestCase):
                 os.environ[key] = value
             os.remove(user_filename)
 
+    def test_long_description(self):
+        long_desc = textwrap.dedent("""\
+        example::
+              We start here
+            and continue here
+          and end here.""")
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": long_desc}
+
+        dist = distutils.dist.Distribution(attrs)
+        meta = self.format_metadata(dist)
+        meta = meta.replace('\n' + 8 * ' ', '\n')
+        self.assertTrue(long_desc in meta)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index ee5829b0775538f52a7117d8a0adb6be056778af..7bc52f195b95fd519223a831abd718816ee6fa04 100644 (file)
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -559,6 +559,5 @@ def rfc822_escape (header):
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
     lines = string.split(header, '\n')
-    lines = map(string.strip, lines)
     header = string.join(lines, '\n' + 8*' ')
     return header

diff --git a/Misc/NEWS b/Misc/NEWS
index 0d5521d945f47280ec2826836c1720f4079d0788..0b164140da384c6beb995570e7b86acbcd869d17 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is 
+  generated in Distutils. Patch by Stephen Emslie.
+
 - Issue #4120: Drop reference to CRT from manifest when building extensions with
   msvc9compiler.