Update support for wrregion and wrregioncache.

[philipp/winterrodeln/wrpylib.git] / wrpylib / wrvalidators.py

diff --git a/wrpylib/wrvalidators.py b/wrpylib/wrvalidators.py
index 7d8b67023ace36d8418d9217c4119c464613413d..d721da0178722971bf2b13048aa71628dea46c27 100644 (file)
--- a/wrpylib/wrvalidators.py
+++ b/wrpylib/wrvalidators.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7

 # -*- coding: iso-8859-15 -*-
 # $Id$
 # $HeadURL$
 # -*- coding: iso-8859-15 -*-
 # $Id$
 # $HeadURL$


@@ -6,12 +6,12 @@
 of properties used in the "Rodelbahnbox" and "Gasthausbox".
 The "to_python" method has to get a unicode argument.
 """
 of properties used in the "Rodelbahnbox" and "Gasthausbox".
 The "to_python" method has to get a unicode argument.
 """

-import formencode
-import formencode.national

 import datetime
 import re
 import xml.dom.minidom as minidom
 from xml.parsers.expat import ExpatError
 import datetime
 import re
 import xml.dom.minidom as minidom
 from xml.parsers.expat import ExpatError

+import formencode
+import formencode.national

 
 
 class NoneValidator(formencode.FancyValidator):
 
 
 class NoneValidator(formencode.FancyValidator):


@@ -149,7 +149,8 @@ class DictValidator(formencode.FancyValidator):
     
     def from_python(self, value):
         for k, v in self.dict.iteritems():
     
     def from_python(self, value):
         for k, v in self.dict.iteritems():

-            if type(v) == type(value) and v == value: return k
+            if v == value:
+                return k

         raise formencode.Invalid('Invalid value', value, None)
 
 
         raise formencode.Invalid('Invalid value', value, None)