cli: undo the effects of [http://allmydata.org/trac/tahoe/changeset/20081222235453...

We're just going to mark unicode in the cli as unsupported for tahoe-lafs-1.3.0.  Unicode filenames on the command-line do actually work for some platforms and probably only if the platform encoding is utf-8, but I'm not sure, and in any case for it to be marked as "supported" it would have to work on all platforms, be thoroughly tested, and also we would have to understand why it worked.  :-)

diff --git a/src/allmydata/scripts/common.py b/src/allmydata/scripts/common.py
index fb404ce14d5787c09ca81d40a7391dc564743142..a6d0a1099fdec7f37779f221802c4cdb3e45254c 100644 (file)
--- a/src/allmydata/scripts/common.py
+++ b/src/allmydata/scripts/common.py
@@ -129,4 +129,4 @@ def get_alias(aliases, path, default):
 
 def escape_path(path):
     segments = path.split("/")
-    return "/".join([urllib.quote(s.encode('utf-8')) for s in segments])
+    return "/".join([urllib.quote(s) for s in segments])

diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py
index 45a2c65b8c255329477bd56b3f42c329b162139c..235cc2a072b9bb3704963dc5fe359d88cd97efa8 100644 (file)
--- a/src/allmydata/scripts/runner.py
+++ b/src/allmydata/scripts/runner.py
@@ -33,12 +33,6 @@ def runner(argv,
            stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr,
            install_node_control=True, additional_commands=None):
 
-    # Convert arguments to unicode
-    new_argv = []
-    for arg in argv:
-      new_argv.append(arg.decode('utf-8'))
-    argv = new_argv
-
     config = Options()
     if install_node_control:
         config.subCommands.extend(startstop_node.subCommands)