From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Wed, 24 Dec 2008 16:53:17 +0000 (-0700)
Subject: cli: undo the effects of [http://allmydata.org/trac/tahoe/changeset/20081222235453... 
X-Git-Url: https://git.rkrishnan.org/frontends/FTP-and-SFTP.txt?a=commitdiff_plain;h=883e51b02dae732af993c732f0c25d793febdc7c;p=tahoe-lafs%2Ftahoe-lafs.git

cli: undo the effects of [http://allmydata.org/trac/tahoe/changeset/20081222235453-92b7f-f841e18afb94e1fd95e6dafb799a3d876dd85c69]
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 fb404ce1..a6d0a109 100644
--- 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 45a2c65b..235cc2a0 100644
--- 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)