Index: /waeup/branches/ulif-importers/src/waeup/utils/converters.py
===================================================================
--- /waeup/branches/ulif-importers/src/waeup/utils/converters.py	(revision 4809)
+++ /waeup/branches/ulif-importers/src/waeup/utils/converters.py	(revision 4810)
@@ -2,15 +2,77 @@
 """
 import grok
-from zope.schema.interfaces import IText
+from zope.component import getMultiAdapter
+from zope.publisher.browser import TestRequest
+try:
+    from zope.app.form.browser.interfaces import ITerms
+except ImportError:
+    from zope.browser.interfaces import ITerms
+from zope.schema.interfaces import IText, IInt, IChoice
 from waeup.interfaces import ISchemaTypeConverter
 
-class TextConverter(grok.Adapter):
+class Converter(grok.Adapter):
+    """Base for string-or-none to zope.schema field converters.
+    """
+    grok.baseclass()
+    grok.provides(ISchemaTypeConverter)
+    
+    def __init__(self, context):
+        """Create a converter with context, a zope.schema.Field, as context.
+        """
+        self.context = context
+
+    def _convertValueFromString(self, string):
+        """You must at least override this method to build a working
+           converter.
+        """
+        raise NotImplementedError('method not implemented')
+    
+    def fromString(self, string=None, strict=True):
+        """Convert ``string`` to value according to assigned field type.
+        """
+        result = None
+        if string is None:
+            if self.context.required is True:
+                result = self.context.default
+            else:
+                result = self.context.missing_value
+        else:
+            result = self._convertValueFromString(string)
+        if strict:
+            self.context.validate(result)
+        return result
+    
+class TextConverter(Converter):
     grok.context(IText)
+    grok.provides(ISchemaTypeConverter)
+
+    def _convertValueFromString(self, string):
+        return unicode(string)
+
+class IntConverter(Converter):
+    grok.context(IInt)
+    grok.provides(ISchemaTypeConverter)
+
+    def _convertValueFromString(self, string):
+        return int(string)
+
+class ChoiceConverter(Converter):
+    grok.context(IChoice)
     grok.provides(ISchemaTypeConverter)
 
     def __init__(self, context):
         self.context = context
-        
-    def convert(self, string=None):
-        return unicode(string)
-            
+        try:
+            self.terms = getMultiAdapter(
+                (self.context.source, TestRequest()), ITerms)
+        except:
+            pass
+
+    def _convertValueFromString(self, string):
+        try:
+            return self.context.source.getTermByToken(string).value
+        except AttributeError:
+            self.terms = getMultiAdapter(
+                (self.context.source, TestRequest()), ITerms)
+            return self.terms.getValue(string)
+
