[Python-checkins] cpython (merge 3.2 -> 3.2): Branch merge

Mon Sep 5 17:46:12 CEST 2011

http://hg.python.org/cpython/rev/c5b00467483b
changeset: 72282:c5b00467483b
branch: 3.2
parent: 72272:2bc122347351
parent: 72278:3629063d1929
user: Éric Araujo <merwok at netwok.org>
date: Mon Sep 05 17:44:07 2011 +0200
summary:
 Branch merge
files:
 Lib/distutils/command/sdist.py | 5 ++-
 Lib/distutils/tests/test_sdist.py | 37 +++++++++++++++---
 Misc/NEWS | 3 +
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py
--- a/Lib/distutils/command/sdist.py
+++ b/Lib/distutils/command/sdist.py
@@ -306,7 +306,10 @@
 
 try:
 self.filelist.process_template_line(line)
- except DistutilsTemplateError as msg:
+ # the call above can raise a DistutilsTemplateError for
+ # malformed lines, or a ValueError from the lower-level
+ # convert_path function
+ except (DistutilsTemplateError, ValueError) as msg:
 self.warn("%s, line %d: %s" % (template.filename,
 template.current_line,
 msg))
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -15,6 +15,7 @@
 from distutils.errors import DistutilsOptionError
 from distutils.spawn import find_executable
 from distutils.log import WARN
+from distutils.filelist import FileList
 from distutils.archive_util import ARCHIVE_FORMATS
 
 SETUP_PY = """
@@ -78,9 +79,6 @@
 dist.include_package_data = True
 cmd = sdist(dist)
 cmd.dist_dir = 'dist'
- def _warn(*args):
- pass
- cmd.warn = _warn
 return dist, cmd
 
 @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
@@ -235,7 +233,8 @@
 # with the `check` subcommand
 cmd.ensure_finalized()
 cmd.run()
- warnings = self.get_logs(WARN)
+ warnings = [msg for msg in self.get_logs(WARN) if
+ msg.startswith('warning: check:')]
 self.assertEqual(len(warnings), 2)
 
 # trying with a complete set of metadata
@@ -244,7 +243,8 @@
 cmd.ensure_finalized()
 cmd.metadata_check = 0
 cmd.run()
- warnings = self.get_logs(WARN)
+ warnings = [msg for msg in self.get_logs(WARN) if
+ msg.startswith('warning: check:')]
 self.assertEqual(len(warnings), 0)
 
 def test_check_metadata_deprecated(self):
@@ -266,7 +266,6 @@
 self.assertEqual(len(output), num_formats)
 
 def test_finalize_options(self):
-
 dist, cmd = self.get_cmd()
 cmd.finalize_options()
 
@@ -286,6 +285,32 @@
 cmd.formats = 'supazipa'
 self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
+ # the following tests make sure there is a nice error message instead
+ # of a traceback when parsing an invalid manifest template
+
+ def _test_template(self, content):
+ dist, cmd = self.get_cmd()
+ os.chdir(self.tmp_dir)
+ self.write_file('MANIFEST.in', content)
+ cmd.ensure_finalized()
+ cmd.filelist = FileList()
+ cmd.read_template()
+ warnings = self.get_logs(WARN)
+ self.assertEqual(len(warnings), 1)
+
+ def test_invalid_template_unknown_command(self):
+ self._test_template('taunt knights *')
+
+ def test_invalid_template_wrong_arguments(self):
+ # this manifest command takes one argument
+ self._test_template('prune')
+
+ @unittest.skipIf(os.name != 'nt', 'test relevant for Windows only')
+ def test_invalid_template_wrong_path(self):
+ # on Windows, trailing slashes are not allowed
+ # this used to crash instead of raising a warning: #8286
+ self._test_template('include examples/')
+
 @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
 def test_get_file_list(self):
 # make sure MANIFEST is recalculated
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -72,6 +72,9 @@
 
 Library
 -------
+ 
+- Issue #8286: The distutils command sdist will print a warning message instead
+ of crashing when an invalid path is given in the manifest template.
 
 - Issue #12841: tarfile unnecessarily checked the existence of numerical user
 and group ids on extraction. If one of them did not exist the respective id
-- 
Repository URL: http://hg.python.org/cpython
