diff options
| -rw-r--r-- | Lib/distutils/tests/test_dist.py | 16 | ||||
| -rw-r--r-- | Lib/distutils/util.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 19 insertions, 1 deletions
diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py index bf59c41..af40186 100644 --- 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 ee5829b..7bc52f1 100644 --- 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 @@ -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. |