[Pkg-bazaar-commits] ./bzr/unstable r265: parse_args: command names must also be ascii

[Martin Pool]

------------------------------------------------------------
revno: 265
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-04-15 12:58:33 +1000
message:
  parse_args: command names must also be ascii
modified:
  bzrlib/commands.py
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-04-15 02:57:26 +0000
+++ b/bzrlib/commands.py	2005-04-15 02:58:33 +0000
@@ -953,7 +953,7 @@
         elif 'version' in opts:
             cmd_version()
             return 0
-        cmd = args.pop(0)
+        cmd = str(args.pop(0))
     except IndexError:
         log_error('usage: bzr COMMAND')
         log_error('  try "bzr help"')
@@ -985,7 +985,7 @@
     # mix arguments and options into one dictionary
     cmdargs = _match_args(cmd, args)
     for k, v in opts.items():
-        cmdargs[str(k.replace('-', '_'))] = v
+        cmdargs[k.replace('-', '_')] = v
 
     if profile:
         import hotshot