Revert "Fix marshaler decode to always set raw value as unicode"

plone · Jan 22, 2015 · 2a9117a · 2a9117a
1 parent ae1f1f5
commit 2a9117a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git a/docs/HISTORY.rst b/docs/HISTORY.rst
@@ -4,20 +4,6 @@ Changelog
 1.2.5 (unreleased)
 ------------------
 
-- Fix marshaler decode to always decode raw value into unicode
-  [datakurre]
-
-- Remove utils.getSiteEncoding, which was deprecated and not used anywhere.
-  [thet]
-
-- For Plone 5, support getting markup control panel settings from the registry,
-  while still supporting normal portal_properties access for Plone < 5.
-  [thet]
-
-- Resolved an interesting circular import case, which wasnt effective because
-  of sort order of imports
-  [thet]
-
 - For Plone 5, support getting markup control panel settings from the registry,
   while still supporting normal portal_properties access for Plone < 5.
   [thet]

diff --git a/plone/app/textfield/marshaler.py b/plone/app/textfield/marshaler.py
@@ -32,12 +32,8 @@ def decode(
                 charset='utf-8',
                 contentType=None,
                 primary=False):
-            try:
-                unicode_value = value.decode(charset)
-            except UnicodeEncodeError:
-                unicode_value = value  # was already unicode
             return RichTextValue(
-                raw=unicode_value,
+                raw=value,
                 mimeType=contentType or self.field.default_mime_type,
                 outputMimeType=self.field.output_mime_type,
                 encoding=charset