merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -3,8 +3,11 @@ are given with the most recent entry first.
 
 2004-??-?? 0.6.6
 Fixed:
-- don't insert spaces into designators, it just confuses users (sf bug 898087)
+- don't insert spaces into designators, it just confuses users (sf bug
+  898087)
 - Eudora can't handle utf-8 headers. We love Eudora. (sf bug 900046)
+- fixed bug in args to new DateHTMLProperty in the local() method (sf bug
+  901444)
 
 
 2004-02-16 0.6.5

roundup/cgi/templating.py

@@ -1031,8 +1031,8 @@ def now(self):
             This is useful for defaulting a new value. Returns a
             DateHTMLProperty.
         '''
-        return DateHTMLProperty(self._client, self._nodeid, self._prop,
-            self._formname, date.Date('.'))
+        return DateHTMLProperty(self._client, self._classname, self._nodeid,
+            self._prop, self._formname, date.Date('.'))
 
     def field(self, size = 30):
         ''' Render a form edit field for the property
@@ -1075,8 +1075,8 @@ def pretty(self, format=_marker):
     def local(self, offset):
         ''' Return the date/time as a local (timezone offset) date/time.
         '''
-        return DateHTMLProperty(self._client, self._nodeid, self._prop,
-            self._formname, self._value.local(offset))
+        return DateHTMLProperty(self._client, self._classname, self._nodeid,
+            self._prop, self._formname, self._value.local(offset))
 
 class IntervalHTMLProperty(HTMLProperty):
     def plain(self):