Ticket #1690: trac-0.10.4-ISO8601.2.patch

trac/util/datefmt.py

@@ -48 +48 @@
             return '%d %s' % (r, r == 1 and unit or unit_plural)
     return ''
 
-def format_datetime(t=None, format='%Y-%m-%d %X', gmt=False):
+def format_datetime(t=None, format='%x %X', gmt=False):
     if t is None:
         t = time.time()
     if not isinstance(t, (list, tuple, time.struct_time)):
@@ -64 +64 @@
         # the above is broken on win32, e.g. we'd get '437' instead of 'cp437'
     return unicode(text, encoding, 'replace')
 
-def format_date(t=None, format='%Y-%m-%d', gmt=False):
+def format_date(t=None, format='%x', gmt=False):
     return format_datetime(t, format, gmt)
 
 def format_time(t=None, format='%X', gmt=False):
@@ -103 +103 @@
     seconds = None
     text = text.strip()
     for format in ['%x %X', '%x, %X', '%X %x', '%X, %x', '%x', '%c',
-                   '%b %d, %Y', '%Y-%m-%d %X', '%Y-%m-%d']:
+                   '%b %d, %Y']:
         try:
             date = time.strptime(text, format)
             seconds = time.mktime(date)