# HG changeset patch
# User alex & cheb
# Date 1263921001 -3600
# Node ID da0d254f2eb0868371665a741e226d5908a794e6
# Parent  e9bed3bc133305dacf6dfb8c7ff1e3ef3560cc7b
remove deprecation warnings + name error

diff -r e9bed3bc1333 -r da0d254f2eb0 web/formfields.py
--- a/web/formfields.py	Tue Jan 19 17:50:48 2010 +0100
+++ b/web/formfields.py	Tue Jan 19 18:10:01 2010 +0100
@@ -685,7 +685,7 @@
         # directly, so handle that case :
         if isinstance(date, basestring):
             try:
-                date = form.parse_datetime(date, 'Date')
+                date = form._cw.parse_datetime(date, 'Date')
             except ValueError, ex:
                 raise ProcessFormError(unicode(ex))
         return date
@@ -701,7 +701,7 @@
         # directly, so handle that case :
         if isinstance(date, basestring):
             try:
-                date = form.parse_datetime(date, 'Datetime')
+                date = form._cw.parse_datetime(date, 'Datetime')
             except ValueError, ex:
                 raise ProcessFormError(unicode(ex))
         return date
@@ -718,7 +718,7 @@
         # directly, so handle that case :
         if isinstance(time, basestring):
             try:
-                time = form.parse_datetime(time, 'Time')
+                time = form._cw.parse_datetime(time, 'Time')
             except ValueError, ex:
                 raise ProcessFormError(unicode(ex))
         return time
@@ -794,7 +794,7 @@
         vocab = relvoc_init(entity, self.name, self.role, self.required)
         method = '%s_%s_vocabulary' % (self.role, self.name)
         try:
-            vocab += getattr(form, method)(rtype, limit)
+            vocab += getattr(form, method)(self.name, limit)
             warn('[3.6] found %s on %s, should override field.choices instead (need tweaks)'
                  % (method, form), DeprecationWarning)
         except AttributeError: