Fix passing ``None`` as the description to a field constructor.

Fixes #69.

2 files changed, 28 insertions, 1 deletions

diff --git a/src/zope/schema/_bootstrapfields.py b/src/zope/schema/_bootstrapfields.py
index 0cfa398..0ba053f 100644
--- a/src/zope/schema/_bootstrapfields.py
+++ b/src/zope/schema/_bootstrapfields.py
@@ -244,7 +244,9 @@ class Field(Attribute):
         # Fix leading whitespace that occurs when using multi-line
         # strings, but don't overwrite the original, we need to
         # preserve it (it could be a MessageID).
-        doc_description = '\n'.join(_DocStringHelpers.docstring_to_lines(description)[:-1])
+        doc_description = '\n'.join(
+            _DocStringHelpers.docstring_to_lines(description or u'')[:-1]
+        )
 
         if title:
             if doc_description:
diff --git a/src/zope/schema/tests/test__bootstrapfields.py b/src/zope/schema/tests/test__bootstrapfields.py
index 3932e85..c8bb2b0 100644
--- a/src/zope/schema/tests/test__bootstrapfields.py
+++ b/src/zope/schema/tests/test__bootstrapfields.py
@@ -486,6 +486,31 @@ class FieldTests(EqualityTestsMixin,
             """)
         )
 
+    def test_ctor_description_none(self):
+        # None values for description don't break the docs.
+        import textwrap
+
+        description = None
+
+        title = u'A title'
+
+        field = self._makeOne(title=title, description=description)
+
+        self.assertIs(field.title, title)
+        self.assertIs(field.description, description)
+
+        self.assertEqual(
+            field.getDoc(),
+            textwrap.dedent("""\
+            A title
+
+            :Implementation: :class:`zope.schema.Field`
+            :Read Only: False
+            :Required: True
+            :Default Value: None
+            """)
+        )
+
     def test_ctor_defaults(self):
 
         field = self._makeOne()