[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Formulator/Fields/Generic - DateTimeField.py:1.1.2.2.2.2

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Formulator/Fields/Generic
In directory cvs.zope.org:/tmp/cvs-serv4573/Fields/Generic

Modified Files:
      Tag: srichter-OFS_Formulator-branch
	DateTimeField.py 
Log Message:
Changes made to make theis merge with the latest 3x branch.

- DateTime initialization and test is fixed
- Various tests adjusted to new Publisher
- Added security ZCML commands due to incorporated ZPT security


=== Zope3/lib/python/Zope/App/Formulator/Fields/Generic/DateTimeField.py 1.1.2.2.2.1 => 1.1.2.2.2.2 ===
 from Zope.App.Formulator.Field import Field
 from Zope.App.Formulator.Validators import DateTimeValidator 
-# XXX Fix me, once the new DateTime module is being written
-from DateTime import DateTime
+import time
 
 
 class DateTimeField(Field):
@@ -31,16 +30,6 @@
     description = 'DateTime Field'
     validator = DateTimeValidator.DateTimeValidator()
 
-    def __init__(self, id, **kw):
-
-        apply(Field.__init__, (self, id), kw)
-
-        if self.getValue('input_style') == 'text':
-            self.sub_form = create_datetime_text_sub_form()
-        elif self.getValue('input_style') == 'list':
-            self.sub_form = create_datetime_list_sub_form()
-        else:
-            assert 0, "Unknown input_style"
             
     def on_value_input_style_changed(self, value):
         if value == 'text':
@@ -58,7 +47,7 @@
         """
         start_datetime = self.get_value('start_datetime')
         end_datetime = self.get_value('end_datetime')
-        current_year = DateTime().year()
+        current_year = time.gmtime(time.time())[0]
         if start_datetime:
             first_year = start_datetime.year()
         else: