r13352 - in Products.Archetypes/branches/1.5/Products: . Archetypes

Author: ldr
Date: Thu Dec 16 15:04:53 2010
New Revision: 13352

Modified:
   Products.Archetypes/branches/1.5/Products/   (props changed)
   Products.Archetypes/branches/1.5/Products/Archetypes/Field.py
   Products.Archetypes/branches/1.5/Products/Archetypes/HISTORY.txt
Log:
backport [13350]

Modified: Products.Archetypes/branches/1.5/Products/Archetypes/Field.py
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/Field.py	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/Field.py	Thu Dec 16 15:04:53 2010
@@ -128,6 +128,8 @@
                 # that occurs during object initialization
                 # (no acquisition wrapper)
                 encoding = 'UTF8'
+            if encoding is None:
+                encoding = 'UTF8'
         value = value.encode(encoding)
     return value
 
@@ -142,6 +144,8 @@
                 # that occurs during object initialization
                 # (no acquisition wrapper)
                 encoding = 'UTF8'
+            if encoding is None:
+                encoding = 'UTF8'
         value = unicode(value, encoding)
     return value
 

Modified: Products.Archetypes/branches/1.5/Products/Archetypes/HISTORY.txt
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/HISTORY.txt	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/HISTORY.txt	Thu Dec 16 15:04:53 2010
@@ -1,6 +1,9 @@
 1.5.17 - unreleased
 ===================
 
+- Handle getCharset() returning None in Field.encode/decode. (backport)
+  [elro]
+
 - Speed up the unicodeTestIn skin script.
   [maurits]
 

------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d