Commits

Anonymous committed d806a3e

0.13dev: Merged from 0.12-stable.

Comments (0)

Files changed (2)

trac/mimeview/rst.py

                               settings_overrides={'halt_level': 6, 
                                                   'warning_stream': False,
                                                   'file_insertion_enabled': 0, 
-                                                  'raw_enabled': 0})
+                                                  'raw_enabled': 0,
+                                                  'warning_stream': False})
         return parts['html_body']

trac/util/datefmt.py

         else:
             format = '%Y-%m-%dT%H:%M:%S%z'
             normalize_Z = True
-    text = t.strftime(format)
+    text = t.strftime(str(format))
     if normalize_Z:
         text = text.replace('+0000', 'Z')
         if not text.endswith('Z'):