[Plone-cvs] r10981 - in CMFPlone/trunk: . patches

[hannosch <svn...@pl...>]

Author: hannosch
Date: Sat Sep 23 23:46:19 2006
New Revision: 10981

Modified:
   CMFPlone/trunk/HISTORY.txt
   CMFPlone/trunk/patches/unicodehacks.py
Log:
Silenced the utf-8 / Unicode DeprecationWarning. We should only emit warnings once we fixed this in all standard cases ourselves. Note: This should make the test runner output a bit more readable again ;)


Modified: CMFPlone/trunk/HISTORY.txt
==============================================================================
--- CMFPlone/trunk/HISTORY.txt	(original)
+++ CMFPlone/trunk/HISTORY.txt	Sat Sep 23 23:46:19 2006
@@ -4,11 +4,14 @@
 
 Plone 3.0 - Unreleased
 
-    - Added migration for the css files added by limi in the previous
-       entry
-       [jladage]
+    - Silenced the utf-8 / Unicode DeprecationWarning. We should only emit
+      warnings once we fixed this in all standard cases ourselves.
+      [hannosch]
+
+    - Added migration for the css files added by limi in the previous entry.
+      [jladage]
 
-    - Split up the CSS into a couple of new modules to ease customization
+    - Split up the CSS into a couple of new modules to ease customization.
       [limi]
 
     - Added an optional keyword argument to the date_components_support script

Modified: CMFPlone/trunk/patches/unicodehacks.py
==============================================================================
--- CMFPlone/trunk/patches/unicodehacks.py	(original)
+++ CMFPlone/trunk/patches/unicodehacks.py	Sat Sep 23 23:46:19 2006
@@ -10,12 +10,16 @@
         except UnicodeDecodeError:
             try:
                 text = structure.decode('utf')
-                warnings.warn(textwrap.dedent('''\
-
-                *** *** Insertion of non-unicode non-ascii text in TAL is deprecated and will be broken in Plone 4.0 !!!
-
-                %s...
-                ''' % (repr(structure), )), DeprecationWarning, 2)
+                # BBB: We shouldn't emit those warnings in Plone 3.0, as all
+                # of the core content types still have this problem. Enable this
+                # once we fixed at least Archetypes to return Unicode (which
+                # should happen in Plone 3.5).
+                #warnings.warn(textwrap.dedent('''\
+                #
+                #*** *** Insertion of non-unicode non-ascii text in TAL is deprecated and will be broken in Plone 4.0 !!!
+                #
+                #%s...
+                #''' % (repr(structure), )), DeprecationWarning, 2)
             except UnicodeDecodeError:
                 # XXX Maybe, raise an exception here instead of a warning?
                 warnings.warn(textwrap.dedent('''\