File FormEncode-1.2.1-svn-fixes.patch of Package python-formencode

Overview Repositories Revisions Requests Users Attributes Meta

File FormEncode-1.2.1-svn-fixes.patch of Package python-formencode (Revision c6ea3ad68e7ab3c69bb3a214615cb697)

Currently displaying revision c6ea3ad68e7ab3c69bb3a214615cb697 , Show latest

diff -urNp FormEncode-1.2.1/formencode/api.py FormEncode/formencode/api.py
--- FormEncode-1.2.1/formencode/api.py    2008-11-21 18:08:24.000000000 -0400
+++ FormEncode/formencode/api.py    2008-12-14 22:42:48.000000000 -0400
@@ -225,13 +225,15 @@ class Validator(declarative.Declarative)
             trans = _stdtrans
 
 
+        msg = self._messages[msgName]
+        msg = trans(msg, **self.gettextargs)
         try:
-            return trans(self._messages[msgName], **self.gettextargs) % kw
+            return msg % kw
         except KeyError, e:
             raise KeyError(
                 "Key not found (%s) for %r=%r %% %r (from: %s)"
                 % (e, msgName, self._messages.get(msgName), kw,
-                   ', '.join(self._messages.keys())))        
+                   ', '.join(self._messages.keys())))
 
     def all_messages(self):
         """
diff -urNp FormEncode-1.2.1/formencode/foreach.py FormEncode/formencode/foreach.py
--- FormEncode-1.2.1/formencode/foreach.py    2008-11-21 18:08:24.000000000 -0400
+++ FormEncode/formencode/foreach.py    2008-12-14 22:42:48.000000000 -0400
@@ -2,9 +2,10 @@
 Validator for repeating items.
 """
 import warnings
+filters = warnings.filters[:]
 warnings.simplefilter('ignore', DeprecationWarning)
 from sets import Set
-warnings.resetwarnings()
+warnings.filters = filters
 try:
     set
 except NameError:
diff -urNp FormEncode-1.2.1/formencode/schema.py FormEncode/formencode/schema.py
--- FormEncode-1.2.1/formencode/schema.py 2008-11-21 18:08:24.000000000 -0400
+++ FormEncode/formencode/schema.py 2008-12-14 22:42:48.000000000 -0400
@@ -434,6 +434,9 @@ class SimpleFormValidator(FancyValidator
 
     validate_partial_form = False
 
+    def __initargs__(self, new_attrs):
+        self.__doc__ = getattr(self.func, '__doc__', None)
+
     def to_python(self, value_dict, state):
         # Since we aren't really supposed to modify things in-place,
         # we'll give the validation function a copy:
diff -urNp FormEncode-1.2.1/formencode/validators.py FormEncode/formencode/validators.py
--- FormEncode-1.2.1/formencode/validators.py 2008-11-21 18:08:24.000000000 -0400
+++ FormEncode/formencode/validators.py 2008-12-14 22:42:48.000000000 -0400
@@ -33,9 +33,10 @@ from interfaces import *
 from api import *
 sha1 = random = None
 
+filters = warnings.filters[:]
 warnings.simplefilter('ignore', DeprecationWarning)
 import sets
-warnings.resetwarnings()
+warnings.filters = filters
 try:
     set
 except NameError:
diff -urNp FormEncode-1.2.1/tests/test_schema.py FormEncode/tests/test_schema.py
--- FormEncode-1.2.1/tests/test_schema.py 2008-11-21 18:08:25.000000000 -0400
+++ FormEncode/tests/test_schema.py 2008-12-14 22:42:49.000000000 -0400
@@ -1,5 +1,5 @@
 from formencode import validators, foreach
-from formencode.schema import Schema, merge_dicts
+from formencode.schema import Schema, merge_dicts, SimpleFormValidator
 from formencode.api import *
 from formencode.variabledecode import NestedVariables
 import cgi
@@ -171,3 +171,19 @@ def test_multiple_chained_validators_err
         pass
     else:
         assert 0
+
+def test_SimpleFormValidator_doc():
+    """
+    Verify SimpleFormValidator preserves the decorated function's
+    docstring.
+    """
+
+    BOGUS_DOCSTRING = "blah blah blah"
+
+    def f(value_dict, state, validator):
+       value_dict['f'] = 99
+
+    f.__doc__ = BOGUS_DOCSTRING
+    g = SimpleFormValidator(f)
+
+    assert f.__doc__ == g.__doc__, "Docstrings don't match!"

Places

File FormEncode-1.2.1-svn-fixes.patch of Package python-formencode (Revision c6ea3ad68e7ab3c69bb3a214615cb697)

Places