Merge pull request #29 from plone/python3

Python3

CHANGES.rst

@@ -1,17 +1,26 @@
 Changelog
 =========
 
-1.2.12 (unreleased)
--------------------
+1.3.0 (unreleased)
+------------------
 
 Breaking changes:
 
 - *add item here*
 
 New features:
 
+- Python 3 fixes, needs plone.rfc822>=2.0b1.
+  [jensens]
+
+Bug fixes:
+
 - *add item here*
 
+
+1.2.12 (unreleased)
+-------------------
+
 Bug fixes:
 
 - purge transform cache when a uid referenced image

README.rst

@@ -1,7 +1,7 @@
 Introduction
 ============
 
-This package provides a zope.schema style field type called RichText which can be used to store a value with a related MIME type.
+This package provides a ``zope.schema`` style field type called ``RichText`` which can be used to store a value with a related MIME type.
 The value can be transformed to an output MIME type, for example to transform from structured text to HTML.
 
 Basic Usage
@@ -15,12 +15,12 @@ To use the field, place it in a schema like so::
     class ITest(Interface):
 
         bodyText = RichText(
-                title=u"Body text",
-                default_mime_type='text/structured',
-                output_mime_type='text/html',
-                allowed_mime_types=('text/structured', 'text/plain',),
-                default=u"Default value"
-            )
+            title=u"Body text",
+            default_mime_type='text/structured',
+            output_mime_type='text/html',
+            allowed_mime_types=('text/structured', 'text/plain',),
+            default=u"Default value"
+        )
 
 This specifies the default MIME type of text content as well as the default output type,
 and a tuple of allowed types.
@@ -138,3 +138,24 @@ Further Reading
 
 See field.txt for more details about the field's behavior,
 and handler.txt for more details about the plone.supermodel handler.
+
+Issue tracker
+=============
+
+Please report issues via the `Plone issue tracker`_.
+
+.. _`Plone issue tracker`: https://github.com/plone/plone.namedfile/issues
+
+Support
+=======
+
+Questions may be answered via `Plone's support channels`_.
+
+.. _`Plone's support channels`: http://plone.org/support
+
+Contributing
+============
+
+Sources are at the `Plone code repository hosted at Github <https://github.com/plone/plone.namedfile>`_.
+
+Contributors please read the document `Process for Plone core's development <http://docs.plone.org/develop/plone-coredev/index.html>`_

plone/app/textfield/field.rst

@@ -113,7 +113,7 @@ Or to get the value encoded:
     >>> value.encoding
     'utf-8'
     >>> value.raw_encoded
-    'Some plain text'
+    b'Some plain text'
 
 Values are equal as long as they have the same `raw`, `mimeType`, `outputMimeType`,
 and `encoding`:
@@ -153,7 +153,7 @@ default MIME types set on the field.
     >>> value.raw
     u'A plain text string'
     >>> value.raw_encoded
-    'A plain text string'
+    b'A plain text string'
     >>> value.output
     u'A PLAIN TEXT STRING'
 

plone/app/textfield/handler.rst

@@ -23,7 +23,8 @@ First, let's wire up the package.
     ... </configure>
     ... """
 
-    >>> from StringIO import StringIO
+    >>> import six
+    >>> from six import StringIO
     >>> from zope.configuration import xmlconfig
     >>> xmlconfig.xmlconfig(StringIO(configuration))
 
@@ -48,7 +49,7 @@ Then, let's test the field
     >>> fieldType = IFieldNameExtractor(field)()
     >>> handler = getUtility(IFieldExportImportHandler, name=fieldType)
     >>> element = handler.write(field, u'dummy', fieldType) #doctest: +ELLIPSIS
-    >>> print prettyXML(element)
+    >>> print(prettyXML(element))
     <field name="dummy" type="plone.app.textfield.RichText">
       <allowed_mime_types>
         <element>text/plain</element>

plone/app/textfield/marshaler.py

@@ -5,6 +5,8 @@
 from zope.component import adapter
 from zope.interface import Interface
 
+import six
+
 
 @adapter(Interface, IRichText)
 class RichTextFieldMarshaler(BaseFieldMarshaler):
@@ -19,21 +21,21 @@ def encode(self, value, charset='utf-8', primary=False):
         return value.raw.encode(charset)
 
     def decode(
-            self,
-            value,
-            message=None,
-            charset='utf-8',
-            contentType=None,
-            primary=False):
-        try:
-            unicode_value = value.decode(charset)
-        except UnicodeEncodeError:
-            unicode_value = value  # was already unicode
+        self,
+        value,
+        message=None,
+        charset='utf-8',
+        contentType=None,
+        primary=False
+    ):
+
+        if isinstance(value, six.binary_type):
+            value = value.decode(charset)
         return RichTextValue(
-            raw=unicode_value,
+            raw=value,
             mimeType=contentType or self.field.default_mime_type,
             outputMimeType=self.field.output_mime_type,
-            encoding=charset
+            encoding=charset,
         )
 
     def getContentType(self):