[FE-CVS] r3806 - FormEncode/trunk/formencode

[<sub...@co...>]

Author: chrisz
Date: 2009-03-12 11:26:20 -0600 (Thu, 12 Mar 2009)
New Revision: 3806

Modified:
   FormEncode/trunk/formencode/validators.py
Log:
Added specific default values for input and output encoding to UnicodeString on the class level.

Modified: FormEncode/trunk/formencode/validators.py
===================================================================
--- FormEncode/trunk/formencode/validators.py	2009-03-12 16:59:49 UTC (rev 3805)
+++ FormEncode/trunk/formencode/validators.py	2009-03-12 17:26:20 UTC (rev 3806)
@@ -1150,6 +1150,8 @@
 
     """
     encoding = 'utf-8'
+    inputEncoding = NoDefault
+    outputEncoding = NoDefault
     messages = {
         'badEncoding' : _("Invalid data or incorrect encoding"),
     }
@@ -1157,11 +1159,13 @@
     def __init__(self, inputEncoding=NoDefault, outputEncoding=NoDefault, **kw):
         String.__init__(self, **kw)
         if inputEncoding is NoDefault:
-            self.inputEncoding = self.encoding
+            if self.inputEncoding is NoDefault:
+                self.inputEncoding = self.encoding
         else:
             self.inputEncoding = inputEncoding
         if outputEncoding is NoDefault:
-            self.outputEncoding = self.encoding
+            if self.outputEncoding is NoDefault:
+                self.outputEncoding = self.encoding
         else:
             self.outputEncoding = outputEncoding