Ticket #9571: 9571-path-to-unicode-r10043.patch

trac/util/text.py

@@ -76 +76 @@
         message = '\n%s\n%s' % (to_unicode('\n'.join(traceback_only)), message)
     return message
 
+def path_to_unicode(path):
+    """Convert a filesystem path to unicode, using the filesystem encoding."""
+    if isinstance(path, str):
+        try:
+            return unicode(text, sys.getfilesystemencoding())
+        except UnicodeDecodeError:
+            return unicode(path, 'latin1')
+    return unicode(path)
+
 _js_quote = {'\\': '\\\\', '"': '\\"', '\b': '\\b', '\f': '\\f',
              '\n': '\\n', '\r': '\\r', '\t': '\\t', "'": "\\'"}
 for i in range(0x20) + [ord(c) for c in '&<>']:

trac/wiki/admin.py

@@ -24 +24 @@
 from trac.util.compat import any
 from trac.util.datefmt import format_datetime, from_utimestamp, \
                               to_utimestamp, utc
-from trac.util.text import to_unicode, unicode_quote, unicode_unquote, \
-                           print_table, printout
+from trac.util.text import path_to_unicode, print_table, printout, \
+                           to_unicode, unicode_quote, unicode_unquote
 from trac.util.translation import _
 
 
@@ -102 +102 @@
         else:
             if os.path.isfile(filename):
                 raise AdminCommandError(_("File '%(name)s' exists",
-                                          name=filename))
+                                          name=path_to_unicode(filename)))
             f = open(filename, 'w')
             try:
                 f.write(text.encode('utf-8'))
@@ -114 +114 @@
         if filename:
             if not os.path.isfile(filename):
                 raise AdminCommandError(_("'%(name)s' is not a file",
-                                          name=filename))
+                                          name=path_to_unicode(filename)))
             data = read_file(filename)
         else:
             data = sys.stdin.read()
@@ -166 +166 @@
                 if os.path.isfile(filename):
                     if self.import_page(filename, page, create_only, replace):
                         printout(_("  %(page)s imported from %(filename)s",
-                                   filename=filename, page=page))
+                                   filename=path_to_unicode(filename),
+                                   page=page))
     
     def _complete_page(self, args):
         if len(args) == 1:
@@ -241 +242 @@
                 os.mkdir(directory)
             else:
                 raise AdminCommandError(_("'%(name)s' is not a directory",
-                                          name=directory))
+                                          name=path_to_unicode(directory)))
         db = self.env.get_db_cnx()
         cursor = db.cursor()
         for p in pages:
@@ -263 +264 @@
                     page = unicode_unquote(page.encode('utf-8'))
                     if self.import_page(path, page, replace=replace):
                         printout(_("  %(page)s imported from %(filename)s",
-                                   filename=path, page=page))
+                                   filename=path_to_unicode(path), page=page))
     
     def _do_load(self, *paths):
         self._load_or_replace(paths, replace=False)