fixed args to some date templating methods

Author: Richard Jones

CHANGES.txt

@@ -14,6 +14,7 @@ are given with the most recent entry first.
   tracker name
 - fixed error in indexargs_url (thanks Patrick Ohly)
 - fixed getnode (sf bug 684531)
+- fixed args to some date templating methods (sf bug 689670)
 
 
 2003-01-24 0.5.5

roundup/cgi/templating.py

@@ -916,21 +916,25 @@ def reldate(self, pretty=1):
             return interval.pretty()
         return str(interval)
 
-    def pretty(self, format='%d %B %Y'):
+    _marker = []
+    def pretty(self, format=_marker):
         ''' Render the date in a pretty format (eg. month names, spaces).
 
             The format string is a standard python strftime format string.
             Note that if the day is zero, and appears at the start of the
             string, then it'll be stripped from the output. This is handy
             for the situatin when a date only specifies a month and a year.
         '''
-        return self._value.pretty()
+        if format is not self._marker:
+            return self._value.pretty(format)
+        else:
+            return self._value.pretty()
 
     def local(self, offset):
         ''' Return the date/time as a local (timezone offset) date/time.
         '''
         return DateHTMLProperty(self._client, self._nodeid, self._prop,
-            self._name, self._value.local())
+            self._name, self._value.local(offset))
 
 class IntervalHTMLProperty(HTMLProperty):
     def plain(self):