Merge lp:~zyga/command-not-found/fix-839609 into lp:~command-not-found-developers/command-not-found/trunk

[Zygmunt Krynicki]

This branch fixes a rather urgent bug that is present in virtually all locales (bug 839609) and updates internal version numbers to match reality

[Zygmunt Krynicki (zyga)]

+1 (mvo merged this in)

review: Approve

=== modified file 'command-not-found'
--- command-not-found	2011-08-25 09:49:51 +0000
+++ command-not-found	2011-09-14 22:14:49 +0000
@@ -5,12 +5,13 @@
 from __future__ import absolute_import
 
 
-__version__ = "0.2.21"
+__version__ = "0.2.43"
 BUG_REPORT_URL = "https://bugs.launchpad.net/command-not-found/+filebug"
 
 try:
+    import gettext
+    import locale
     import sys
-    import gettext
     from optparse import OptionParser
 
     from CommandNotFound.util import crash_guard
@@ -24,6 +25,17 @@
     cnf.install(unicode=True)
 
 
+def fix_sys_argv(encoding=None):
+    """
+    Fix sys.argv to have only unicode strings, not binary strings.
+    This is required by various places where such argument might be
+    automatically coerced to unicode string for formatting
+    """
+    if encoding is None:
+        encoding = locale.getpreferredencoding()
+    sys.argv = [arg.decode(encoding) for arg in sys.argv]
+
+
 class LocaleOptionParser(OptionParser):
     """
     OptionParser is broken as its implementation of _get_encoding() uses
@@ -40,6 +52,7 @@
 
 def main():
     enable_i18n()
+    fix_sys_argv()
     parser = LocaleOptionParser(
         version=__version__,
         usage=_("%prog [options] <command-name>"))
@@ -52,7 +65,9 @@
     (options, args) = parser.parse_args()
     if len(args) == 1:
         cnf = CommandNotFound(options.data_dir)
-        if not cnf.advise(args[0], options.ignore_installed):
+        # Note: we need to encode program name to utf-8 as gdbm does not seem
+        # to handle unicode strings.
+        if not cnf.advise(args[0].encode('utf-8'), options.ignore_installed):
             print >>sys.stderr, _("%s: command not found") % args[0]
 
 if __name__ == "__main__":

=== modified file 'setup.py'
--- setup.py	2011-08-10 12:45:45 +0000
+++ setup.py	2011-09-14 22:14:49 +0000
@@ -16,7 +16,7 @@
 
 setup(
     name='command-not-found',
-    version='0.1',
+    version='0.2.43',
     packages=['CommandNotFound'],
     scripts=['command-not-found'],
     data_files=[