Branch merge

2 files changed, 13 insertions, 1 deletions

diff --git a/distutils2/metadata.py b/distutils2/metadata.py
index bcb766b..8ea4d53 100644
--- a/distutils2/metadata.py
+++ b/distutils2/metadata.py
@@ -35,6 +35,9 @@ try:
 
         def system_message(self, level, message, *children, **kwargs):
             self.messages.append((level, message, children, kwargs))
+            return nodes.system_message(message, level=level, type=self.
+                    levels[level], *children, **kwargs)
+
 
     _HAS_DOCUTILS = True
 except ImportError:
@@ -480,7 +483,7 @@ class Metadata(object):
         return value
 
     def check(self, strict=False, restructuredtext=False):
-        """Check if the metadata is compliant. If strict is False then raise if
+        """Check if the metadata is compliant. If strict is True then raise if
         no Name or Version are provided"""
         self.set_metadata_version()
 
diff --git a/distutils2/tests/test_metadata.py b/distutils2/tests/test_metadata.py
index 4f586cb..80fc278 100644
--- a/distutils2/tests/test_metadata.py
+++ b/distutils2/tests/test_metadata.py
@@ -379,6 +379,15 @@ class MetadataTestCase(LoggingCatcher,
         folded_desc = desc.replace('\n', '\n' + (7 * ' ') + '|')
         self.assertIn(folded_desc, out.getvalue())
 
+    def test_description_invalid_rst(self):
+        # make sure bad rst is well handled in the description attribute
+        metadata = Metadata()
+        description_with_bad_rst = ':funkie:`str`'  # Sphinx-specific markup
+        metadata['description'] = description_with_bad_rst
+        missing, warnings = metadata.check(restructuredtext=True)
+        warning = warnings[0][1]
+        self.assertIn('funkie', warning)
+
     def test_project_url(self):
         metadata = Metadata()
         metadata['Project-URL'] = [('one', 'http://ok')]