(original) (raw)

changeset: 72827:e16792003597 branch: 3.2 user: Éric Araujo merwok@netwok.org date: Sun Oct 09 07:25:33 2011 +0200 files: Lib/distutils/tests/test_check.py Lib/distutils/tests/test_register.py description: Add tests for Unicode handling in distutils’ check and register (#13114) diff -r 6542e4028ed2 -r e16792003597 Lib/distutils/tests/test_check.py --- a/Lib/distutils/tests/test_check.py Sun Oct 09 06:32:38 2011 +0200 +++ b/Lib/distutils/tests/test_check.py Sun Oct 09 07:25:33 2011 +0200 @@ -46,6 +46,15 @@ cmd = self._run(metadata, strict=1) self.assertEqual(cmd._warnings, 0) + # now a test with non-ASCII characters + metadata = {'url': 'xxx', 'author': '\u00c9ric', + 'author_email': 'xxx', 'name': 'xxx', + 'version': 'xxx', + 'description': 'Something about esszet \u00df', + 'long_description': 'More things about esszet \u00df'} + cmd = self._run(metadata) + self.assertEqual(cmd._warnings, 0) + def test_check_document(self): if not HAS_DOCUTILS: # won't test without docutils return @@ -80,8 +89,8 @@ self.assertRaises(DistutilsSetupError, self._run, metadata, **{'strict': 1, 'restructuredtext': 1}) - # and non-broken rest - metadata['long_description'] = 'title\n=====\n\ntest' + # and non-broken rest, including a non-ASCII character to test #12114 + metadata['long_description'] = 'title\n=====\n\ntest \u00df' cmd = self._run(metadata, strict=1, restructuredtext=1) self.assertEqual(cmd._warnings, 0) diff -r 6542e4028ed2 -r e16792003597 Lib/distutils/tests/test_register.py --- a/Lib/distutils/tests/test_register.py Sun Oct 09 06:32:38 2011 +0200 +++ b/Lib/distutils/tests/test_register.py Sun Oct 09 07:25:33 2011 +0200 @@ -214,7 +214,7 @@ # metadata are OK but long_description is broken metadata = {'url': 'xxx', 'author': 'xxx', - 'author_email': 'xxx', + 'author_email': 'éxéxé', 'name': 'xxx', 'version': 'xxx', 'long_description': 'title\n==\n\ntext'} @@ -247,6 +247,24 @@ finally: del register_module.input + # and finally a Unicode test (bug #12114) + metadata = {'url': 'xxx', 'author': '\u00c9ric', + 'author_email': 'xxx', 'name': 'xxx', + 'version': 'xxx', + 'description': 'Something about esszet \u00df', + 'long_description': 'More things about esszet \u00df'} + + cmd = self._get_cmd(metadata) + cmd.ensure_finalized() + cmd.strict = 1 + inputs = Inputs('1', 'tarek', 'y') + register_module.input = inputs.__call__ + # let's run the command + try: + cmd.run() + finally: + del register_module.input + def test_check_metadata_deprecated(self): # makes sure make_metadata is deprecated cmd = self._get_cmd() /merwok@netwok.org