Merge lp:~cjwatson/command-not-found/python3 into lp:~command-not-found-developers/command-not-found/trunk

[Colin Watson]

Port to Python 3. This should all still run under Python 2 as well.

[Zygmunt Krynicki (zyga)]

47 + if key is not bytes:

I think you meant isinstance() here

74 - (PACKAGE, BASENAME_PATH) = range(2)
75 + (PACKAGE, BASENAME_PATH) = list(range(2))

299 - (SOFT, HARD) = range(2)
300 + (SOFT, HARD) = list(range(2))

(and some more), those changes seem unneeded, am I missing something?

Otherwise, wow, lots of old code that brings back memories, great work in porting that to python3! :)

review: Needs Fixing

[lp:~cjwatson/command-not-found/python3]

174. By Colin Watson on 2012-06-13

Fix "key is not bytes" thinko.

[Barry Warsaw (barry)]

@Zigmunt: re: line 47 yep, I caught that one too, and Colin fixed it in the update.

Re the wrapping of list(range(2)) etc. I think you're right:

Python 3.2.3 (default, May 3 2012, 15:51:42)
[GCC 4.6.3] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> (soft, hard) = range(2)
>>> soft
0
>>> hard
1

[Colin Watson (cjwatson)]

list(range(...)): That was indeed my misunderstanding from blindly believing 2to3. I tested it yesterday for something else and realised that was redundant. I've reverted those changes; please re-review?

[lp:~cjwatson/command-not-found/python3]

175. By Colin Watson on 2012-06-13

Revert unnecessary list(range(...)) wrapping.

[Zygmunt Krynicki (zyga)]

Looks perfect now, thanks!

review: Approve

[Colin Watson (cjwatson)]

Great, thanks! Perhaps you could land this? I can help with rolling a
new Ubuntu package if you like, but I don't have commit access to
lp:command-not-found.

[Michael Vogt (mvo)]

On Wed, Jun 13, 2012 at 11:40:40PM -0000, Colin Watson wrote:
> Great, thanks! Perhaps you could land this? I can help with rolling a
> new Ubuntu package if you like, but I don't have commit access to
> lp:command-not-found.

I landed this in lp:command-not-found now, thanks for the branch!

Cheers,
 Michael

=== modified file 'CommandNotFound/CommandNotFound.py'
--- CommandNotFound/CommandNotFound.py	2012-01-13 11:11:20 +0000
+++ CommandNotFound/CommandNotFound.py	2012-06-13 16:12:19 +0000
@@ -1,17 +1,27 @@
 # (c) Zygmunt Krynicki 2005, 2006, 2007, 2008
 # Licensed under GPL, see COPYING for the whole text
 
-import gdbm
+from __future__ import print_function
+
+try:
+    import dbm.gnu as gdbm
+except ImportError:
+    import gdbm
 import gettext
 import grp
 import os
 import os.path
 import posix
-import string
 import sys
 import subprocess
 
-_ = gettext.translation("command-not-found", fallback=True).ugettext
+from functools import cmp_to_key
+
+if sys.version >= "3":
+    _gettext_method = "gettext"
+else:
+    _gettext_method = "ugettext"
+_ = getattr(gettext.translation("command-not-found", fallback=True), _gettext_method)
 
 
 class BinaryDatabase(object):
@@ -21,12 +31,16 @@
         if filename.endswith(".db"):
             try:
                 self.db = gdbm.open(filename, "r")
-            except gdbm.error, err:
-                print >> sys.stderr, "Unable to open binary database %s: %s" % (filename, err)
+            except gdbm.error as err:
+                print("Unable to open binary database %s: %s" % (filename, err), file=sys.stderr)
 
     def lookup(self, key):
-        if self.db and self.db.has_key(key):
-            return self.db[key]
+        if not isinstance(key, bytes):
+            # gdbm does not entirely handle Unicode strings; "self.db[key]"
+            # works, but "key in self.db" does not.
+            key = key.encode('utf-8')
+        if self.db and key in self.db:
+            return self.db[key].decode('utf-8')
         else:
             return None
 
@@ -35,10 +49,9 @@
 
     def __init__(self, filename):
         self.rows = []
-        dbfile = file(filename)
-        for line in (line.strip() for line in dbfile):
-            self.rows.append(line.split("|"))
-        dbfile.close()
+        with open(filename) as dbfile:
+            for line in (line.strip() for line in dbfile):
+                self.rows.append(line.split("|"))
 
     def lookup(self, column, text):
         result = []
@@ -109,7 +122,8 @@
         self.priority_overrides = []
         p = os.path.join(data_dir, "priority.txt")
         if os.path.exists(p):
-            self.priority_overrides = map(string.strip, open(p).readlines())
+            with open(p) as priority_file:
+                self.priority_overrides = [line.strip() for line in priority_file]
         self.components = ['main', 'universe', 'contrib', 'restricted',
                            'non-free', 'multiverse']
         self.components.reverse()
@@ -131,11 +145,11 @@
             for (package, comp) in packages:
                 possible_alternatives.append((w, package, comp))
         if len(possible_alternatives) > max_len:
-            print >> sys.stderr, _("No command '%s' found, but there are %s similar ones") % (word, len(possible_alternatives))
+            print(_("No command '%s' found, but there are %s similar ones") % (word, len(possible_alternatives)), file=sys.stderr)
         elif len(possible_alternatives) > 0:
-            print >> sys.stderr, _("No command '%s' found, did you mean:") % word
+            print(_("No command '%s' found, did you mean:") % word, file=sys.stderr)
             for (w, p, c) in possible_alternatives:
-                print >> sys.stderr, _(" Command '%s' from package '%s' (%s)") % (w, p, c)
+                print(_(" Command '%s' from package '%s' (%s)") % (w, p, c), file=sys.stderr)
 
     def getPackages(self, command):
         result = set()
@@ -145,12 +159,10 @@
 
     def getBlacklist(self):
         try:
-            blacklist = file(os.sep.join((os.getenv("HOME", "/root"), ".command-not-found.blacklist")))
-            return [line.strip() for line in blacklist if line.strip() != ""]
+            with open(os.sep.join((os.getenv("HOME", "/root"), ".command-not-found.blacklist"))) as blacklist:
+                return [line.strip() for line in blacklist if line.strip() != ""]
         except IOError:
             return []
-        else:
-            blacklist.close()
 
     def _getSourcesList(self):
         try:
@@ -188,13 +200,18 @@
             yidx = self.components.index(y[1])
         except:
             xidx = -1
-        return (yidx - xidx) or cmp(x, y)
+        # http://python3porting.com/differences.html#comparisons
+        return (yidx - xidx) or ((x > y) - (x < y))
 
     def install_prompt(self, package_name):
         if not "COMMAND_NOT_FOUND_INSTALL_PROMPT" in os.environ:
             return
         if package_name:
-            answer = raw_input(_("Do you want to install it? (N/y)"))
+            prompt = _("Do you want to install it? (N/y)")
+            if sys.version >= '3':
+                answer = input(prompt)
+            else:
+                answer = raw_input(prompt)
             if sys.stdin.encoding and isinstance(answer, str):
                 # Decode the answer so that we get an unicode value
                 answer = answer.decode(sys.stdin.encoding)
@@ -204,7 +221,7 @@
                 else:
                     command_prefix = "sudo "
                 install_command = "%sapt-get install %s" % (command_prefix, package_name)
-                print >> sys.stdout, "%s" % install_command
+                print("%s" % install_command, file=sys.stdout)
                 subprocess.call(install_command.split(), shell=False)
 
     def advise(self, command, ignore_installed=False):
@@ -225,16 +242,16 @@
         # check if we have it in a common prefix that may not be in the PATH
         if prefixes and not ignore_installed:
             if len(prefixes) == 1:
-                print >> sys.stderr, _("Command '%(command)s' is available in '%(place)s'") % {"command": command, "place": os.path.join(prefixes[0], command)}
+                print(_("Command '%(command)s' is available in '%(place)s'") % {"command": command, "place": os.path.join(prefixes[0], command)}, file=sys.stderr)
             else:
-                print >> sys.stderr, _("Command '%(command)s' is available in the following places") % {"command": command}
+                print(_("Command '%(command)s' is available in the following places") % {"command": command}, file=sys.stderr)
                 for prefix in prefixes:
-                    print >> sys.stderr, " * %s" % os.path.join(prefix, command)
+                    print(" * %s" % os.path.join(prefix, command), file=sys.stderr)
             missing = list(set(prefixes) - set(os.getenv("PATH", "").split(":")))
             if len(missing) > 0:
-                print >> sys.stderr, _("The command could not be located because '%s' is not included in the PATH environment variable.") % ":".join(missing)
+                print(_("The command could not be located because '%s' is not included in the PATH environment variable.") % ":".join(missing), file=sys.stderr)
                 if "sbin" in ":".join(missing):
-                    print >> sys.stderr, _("This is most likely caused by the lack of administrative privileges associated with your user account.")
+                    print(_("This is most likely caused by the lack of administrative privileges associated with your user account."), file=sys.stderr)
             return False
 
         # do not give advice if we are in a situation where apt-get
@@ -249,31 +266,31 @@
         if len(packages) == 0:
             self.print_spelling_suggestion(command)
         elif len(packages) == 1:
-            print >> sys.stderr, _("The program '%s' is currently not installed. ") % command,
+            print(_("The program '%s' is currently not installed. ") % command, end="", file=sys.stderr)
             if posix.geteuid() == 0:
-                print >> sys.stderr, _("You can install it by typing:")
-                print >> sys.stderr, "apt-get install %s" % packages[0][0]
+                print(_("You can install it by typing:"), file=sys.stderr)
+                print("apt-get install %s" % packages[0][0], file=sys.stderr)
                 self.install_prompt(packages[0][0])
             elif self.user_can_sudo:
-                print >> sys.stderr, _("You can install it by typing:")
-                print >> sys.stderr, "sudo apt-get install %s" % packages[0][0]
+                print(_("You can install it by typing:"), file=sys.stderr)
+                print("sudo apt-get install %s" % packages[0][0], file=sys.stderr)
                 self.install_prompt(packages[0][0])
             else:
-                print >> sys.stderr, _("To run '%(command)s' please ask your administrator to install the package '%(package)s'") % {'command': command, 'package': packages[0][0]}
+                print(_("To run '%(command)s' please ask your administrator to install the package '%(package)s'") % {'command': command, 'package': packages[0][0]}, file=sys.stderr)
             if not packages[0][1] in self.sources_list:
-                print >> sys.stderr, _("You will have to enable the component called '%s'") % packages[0][1]
+                print(_("You will have to enable the component called '%s'") % packages[0][1], file=sys.stderr)
         elif len(packages) > 1:
-            packages.sort(self.sortByComponent)
-            print >> sys.stderr, _("The program '%s' can be found in the following packages:") % command
+            packages.sort(key=cmp_to_key(self.sortByComponent))
+            print(_("The program '%s' can be found in the following packages:") % command, file=sys.stderr)
             for package in packages:
                 if package[1] in self.sources_list:
-                    print >> sys.stderr, " * %s" % package[0]
+                    print(" * %s" % package[0], file=sys.stderr)
                 else:
-                    print >> sys.stderr, " * %s" % package[0] + " (" + _("You will have to enable component called '%s'") % package[1] + ")"
+                    print(" * %s" % package[0] + " (" + _("You will have to enable component called '%s'") % package[1] + ")", file=sys.stderr)
             if posix.geteuid() == 0:
-                print >> sys.stderr, _("Try: %s <selected package>") % "apt-get install"
+                print(_("Try: %s <selected package>") % "apt-get install", file=sys.stderr)
             elif self.user_can_sudo:
-                print >> sys.stderr, _("Try: %s <selected package>") % "sudo apt-get install"
+                print(_("Try: %s <selected package>") % "sudo apt-get install", file=sys.stderr)
             else:
-                print >> sys.stderr, _("Ask your administrator to install one of them")
+                print(_("Ask your administrator to install one of them"), file=sys.stderr)
         return len(packages) > 0

=== modified file 'CommandNotFound/__init__.py'
--- CommandNotFound/__init__.py	2011-08-10 13:02:29 +0000
+++ CommandNotFound/__init__.py	2012-06-13 16:12:19 +0000
@@ -1,1 +1,3 @@
-from CommandNotFound import CommandNotFound
+from __future__ import absolute_import
+
+from CommandNotFound.CommandNotFound import CommandNotFound

=== modified file 'CommandNotFound/util.py'
--- CommandNotFound/util.py	2011-08-25 09:49:51 +0000
+++ CommandNotFound/util.py	2012-06-13 16:12:19 +0000
@@ -1,12 +1,18 @@
 # (c) Zygmunt Krynicki 2008
 # Licensed under GPL, see COPYING for the whole text
 
+from __future__ import print_function
+
 import gettext
 import locale
 import sys
 import gettext
 
-_ = gettext.translation("command-not-found", fallback=True).ugettext
+if sys.version >= "3":
+    _gettext_method = "gettext"
+else:
+    _gettext_method = "ugettext"
+_ = getattr(gettext.translation("command-not-found", fallback=True), _gettext_method)
 
 
 def crash_guard(callback, bug_report_url, version):
@@ -16,21 +22,21 @@
     try:
         try:
             callback()
-        except Exception, ex:
-            print >> sys.stderr, _("Sorry, command-not-found has crashed! Please file a bug report at:")
-            print >> sys.stderr, bug_report_url
-            print >> sys.stderr, _("Please include the following information with the report:")
-            print >> sys.stderr
-            print >> sys.stderr, _("command-not-found version: %s") % version
-            print >> sys.stderr, _("Python version: %d.%d.%d %s %d") % sys.version_info
+        except Exception as ex:
+            print(_("Sorry, command-not-found has crashed! Please file a bug report at:"), file=sys.stderr)
+            print(bug_report_url, file=sys.stderr)
+            print(_("Please include the following information with the report:"), file=sys.stderr)
+            print(file=sys.stderr)
+            print(_("command-not-found version: %s") % version, file=sys.stderr)
+            print(_("Python version: %d.%d.%d %s %d") % sys.version_info, file=sys.stderr)
             try:
                 import subprocess
                 subprocess.call(["lsb_release", "-i", "-d", "-r", "-c"], stdout=sys.stderr)
             except (ImportError, OSError):
                 pass
-            print >> sys.stderr, _("Exception information:")
-            print >> sys.stderr
-            print >> sys.stderr, ex
+            print(_("Exception information:"), file=sys.stderr)
+            print(file=sys.stderr)
+            print(ex, file=sys.stderr)
             try:
                 import traceback
                 traceback.print_exc()

=== modified file 'UnifiedDataExtractor/DebPackage.py'
--- UnifiedDataExtractor/DebPackage.py	2011-08-10 13:03:51 +0000
+++ UnifiedDataExtractor/DebPackage.py	2012-06-13 16:12:19 +0000
@@ -1,6 +1,8 @@
 # (c) Zygmunt Krynicki 2005,
 # Licensed under GPL, see COPYING for the whole text
 
+from __future__ import print_function
+
 import warnings
 warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
 
@@ -170,15 +172,18 @@
 
     def __init__(self, filename):
         self.filename = filename
-        self._sections = apt_pkg.ParseSection(self.getControlFile("control"))
+        self._sections = apt_pkg.TagSection(self.getControlFile("control"))
 
     arch = property(lambda self: self._sections["Architecture"], None, None, "Architecture the package is compiled for")
 
     name = property(lambda self: self._sections["Package"], None, None, "Cannonical package name")
 
     def getControlFile(self, name):
-        """ Returns the contents of given file in debian/ or None if it does not exits """
-        return apt_inst.debExtractControl(file(self.filename), name)
+        """ Returns the contents of given file in debian/ or None if it does not exist """
+        try:
+            return apt_inst.DebFile(self.filename).control.extractdata(name)
+        except LookupError:
+            return None
 
     @property
     def items(self):
@@ -186,21 +191,18 @@
         Each file is represented by an instance of  FileInfo """
         items = []
 
-        def extract_cb(kind, name, target, mode, uid, gid, size, mtime, major, minor):
-            if kind == "FILE":
-                items.append(FileInfo(name, mode, uid, gid, size, mtime))
-            elif kind == "DIR":
-                items.append(DirectoryInfo(name, mode, uid, gid, size, mtime))
-            elif kind == "SYMLINK":
-                items.append(SymbolicLinkInfo(name, target, mode, uid, gid, size, mtime))
-            elif kind == "HARDLINK":
-                items.append(HardLinkInfo(name, target, mode, uid, gid, size, mtime))
-            elif kind == "FIFO":
-                items.append(FifoInfo(name, mode, uid, gid, size, mtime))
+        def extract_cb(member, data):
+            if member.isfile():
+                items.append(FileInfo(member.name, member.mode, member.uid, member.gid, member.size, member.mtime))
+            elif member.isdir():
+                items.append(DirectoryInfo(member.name, member.mode, member.uid, member.gid, member.size, member.mtime))
+            elif member.issym():
+                items.append(SymbolicLinkInfo(member.name, member.linkname, member.mode, member.uid, member.gid, member.size, member.mtime))
+            elif member.islnk():
+                items.append(HardLinkInfo(member.name, member.linkname, member.mode, member.uid, member.gid, member.size, member.mtime))
+            elif member.isfifo():
+                items.append(FifoInfo(member.name, member.mode, member.uid, member.gid, member.size, member.mtime))
             else:
-                print "unsupported kind: %s" % kind
-        try:
-            apt_inst.debExtract(open(self.filename), extract_cb, "data.tar.gz")
-        except:
-            apt_inst.debExtract(open(self.filename), extract_cb, "data.tar.bz2")
+                print("unsupported member type: %s" % member)
+        apt_inst.DebFile(self.filename).data.go(extract_cb)
         return items

=== modified file 'UnifiedDataExtractor/create-binary-database'
--- UnifiedDataExtractor/create-binary-database	2012-01-11 14:32:50 +0000
+++ UnifiedDataExtractor/create-binary-database	2012-06-13 16:12:19 +0000
@@ -5,8 +5,10 @@
 import glob
 import os
 import os.path
-import gdbm
-import string
+try:
+    import dbm.gnu as gdbm
+except ImportError:
+    import gdbm
 import subprocess
 
 class ProgramGroup(object):
@@ -16,7 +18,7 @@
         self.programs = dict()
     def notice_package(self, package_name, user_visible_program_names):
         for user_visible_program_name in user_visible_program_names:
-            if not self.programs.has_key(user_visible_program_name):
+            if user_visible_program_name not in self.programs:
                 self.programs[user_visible_program_name] = set()
             self.programs[user_visible_program_name].add(package_name)
     def write_database(self):
@@ -28,23 +30,26 @@
 def build_binary_databases(basedir=".", currentArchOnly=False):
     myarch = subprocess.Popen(
         ["dpkg","--print-architecture"],
-        stdout=subprocess.PIPE).communicate()[0].strip()
+        stdout=subprocess.PIPE,
+        universal_newlines=True).communicate()[0].strip()
     groups = dict()
     for data_file in glob.glob("%s/*.data" % basedir):
-        for line in map(string.strip, open(data_file)):
-            if not line or line.startswith("#"):
-                continue
-            arch, repo, package_name, executables = line.split('|')
-            if (currentArchOnly and arch != "all" and arch != myarch):
-                continue
-            group_name = "%s-%s" % (arch, repo)
-            if not groups.has_key(group_name):
-                groups[group_name] = ProgramGroup(arch, repo)
-            user_visible_program_names = [
-                os.path.basename(executable)
-                for executable in executables.split(',')]
-            groups[group_name].notice_package(
-                package_name, user_visible_program_names)
+        with open(data_file) as fd:
+            for line in fd:
+                line = line.strip()
+                if not line or line.startswith("#"):
+                    continue
+                arch, repo, package_name, executables = line.split('|')
+                if (currentArchOnly and arch != "all" and arch != myarch):
+                    continue
+                group_name = "%s-%s" % (arch, repo)
+                if group_name not in groups:
+                    groups[group_name] = ProgramGroup(arch, repo)
+                user_visible_program_names = [
+                    os.path.basename(executable)
+                    for executable in executables.split(',')]
+                groups[group_name].notice_package(
+                    package_name, user_visible_program_names)
     # write it out
     for group in groups.values():
         group.write_database()

=== modified file 'UnifiedDataExtractor/diff-scan-data'
--- UnifiedDataExtractor/diff-scan-data	2009-06-30 08:01:27 +0000
+++ UnifiedDataExtractor/diff-scan-data	2012-06-13 16:12:19 +0000
@@ -1,7 +1,8 @@
 #!/usr/bin/python
 
+from __future__ import print_function
+
 import sys
-import string
 import apt
 
 def normalize_line(line):
@@ -21,10 +22,12 @@
     new = set()
     #func = normalize_line
     func = pkg_only
-    for l in map(func, open(old_scan_data)):
-        old.add(l)
-    for l in map(func, open(new_scan_data)):
-        new.add(l)
+    with open(old_scan_data) as old_scan_file:
+        for l in map(func, old_scan_file):
+            old.add(l)
+    with open(new_scan_data) as new_scan_file:
+        for l in map(func, new_scan_file):
+            new.add(l)
     return (set(new - old), set(old - new))
 
 def get_comp_changes(oldf, newf):
@@ -36,12 +39,14 @@
     old = {}
     new = {}
     comp_changes = {}
-    for l in map(func, open(oldf)):
-        (comp, pkg) = l.split("|")
-        old[pkg] = comp
-    for l in map(func, open(newf)):
-        (comp, pkg) = l.split("|")
-        new[pkg] = comp
+    with open(oldf) as oldfile:
+        for l in map(func, oldfile):
+            (comp, pkg) = l.split("|")
+            old[pkg] = comp
+    with open(newf) as newfile:
+        for l in map(func, newfile):
+            (comp, pkg) = l.split("|")
+            new[pkg] = comp
     for (pkg,comp) in old.items():
         if pkg in new and new[pkg] != comp:
             comp_changes[pkg] = (comp, new[pkg])
@@ -49,7 +54,7 @@
 
 if __name__ == "__main__":
     if len(sys.argv) < 3:
-        print "need two files"
+        print("need two files")
         sys.exit(1)
     
     # oldfile, newfile given from commandline
@@ -59,21 +64,21 @@
     # first check for additions and removals
     (new_pkgs, removed_pkgs) = get_new_and_removed_packages(oldf, newf)
     
-    print "--- new packages ---"
+    print("--- new packages ---")
     for line in new_pkgs:
-        print line
+        print(line)
 
-    print "\n\n"
-    print "--- removed packages ---"
+    print("\n\n")
+    print("--- removed packages ---")
     for line in removed_pkgs:
-        print line
+        print(line)
     
     # now do the component changes
-    print "\n\n"
-    print "--- changed component ---"
+    print("\n\n")
+    print("--- changed component ---")
     changes = get_comp_changes(oldf, newf)
     for (pkg, change) in changes.items():
         # change is a tuple with (old_comp, new_comp)
-        print "%s changed from '%s' to '%s'" % (pkg, change[0], change[1])
+        print("%s changed from '%s' to '%s'" % (pkg, change[0], change[1]))
 
 

=== modified file 'UnifiedDataExtractor/scan'
--- UnifiedDataExtractor/scan	2007-01-05 15:51:46 +0000
+++ UnifiedDataExtractor/scan	2012-06-13 16:12:19 +0000
@@ -2,13 +2,18 @@
 # (c) Zygmunt Krynicki 2005,
 # Licensed under GPL, see COPYING for the whole text
 
+from __future__ import print_function
+
 import os
 import os.path
 import sys
 import re
 import logging
 import DebPackage
-import urllib
+try:
+    from urllib.parse import unquote
+except ImportError:
+    from urllib import unquote
 import apt
 import apt_pkg
 
@@ -23,8 +28,8 @@
     def __str__(self):
         return "%s|%s|%s|%s" % (self.arch, self.repo, self.name, ",".join(self.executables))
     def display(self):
-        print "Package: %s for arch %s in repo %s" % (self.name, self.arch, self.repo)
-        print "Executables: ", self.executables
+        print("Package: %s for arch %s in repo %s" % (self.name, self.arch, self.repo))
+        print("Executables: ", self.executables)
 
 def strip_comment(line):
     i = line.find('#')
@@ -60,7 +65,7 @@
     def nice_expand(*text_list):
         return set(one_element_tuple_to_value(expand_values(*text_list)))
     if contents != None:
-        for line in contents.replace("\\\n","").splitlines():
+        for line in contents.decode(errors='replace').replace("\\\n","").splitlines():
             line = strip_comment(line).strip()
             if line == "":
                 continue
@@ -164,7 +169,7 @@
 def analyze_package(filename):
     try:
         package = DebPackage.load(filename)
-    except Exception, ex:
+    except Exception as ex:
         logging.error("Unable to process package %s: %s" % (filename, ex))
         return None
     logging.info("PACKAGE: %s" % package.filename)
@@ -199,15 +204,15 @@
     pkgname = m.group(1)
     ver = m.group(2)
     # fix the quoting
-    ver = urllib.unquote(ver)
+    ver = unquote(ver)
     pkgarch = m.group(3)
     # check arch
     if pkgarch != "all" and arch != pkgarch:
         return False
     # check distro
     candVer = "xxx"
-    if cache.has_key(pkgname):
-        candVer = cache[pkgname].candidateVersion
+    if pkgname in cache:
+        candVer = getattr(cache[pkgname].candidate, "version", None)
         # strip the epoch
         if candVer and ":" in candVer:
             candVer = candVer.split(":")[1]
@@ -224,10 +229,11 @@
             if package_info is None:
                 continue
             #package_info.display()
-            print >> output, package_info
+            print(package_info, file=output)
 
 def scan(dir_path, output):
-    os.path.walk(dir_path, dir_walk, output)
+    for dirpath, dirnames, filenames in os.walk(dir_path):
+        dir_walk(output, dirpath, filenames)
     
 if __name__ == "__main__":
     global arch, cache
@@ -239,22 +245,22 @@
             filemode='w')
     # init output
     filename="scan.data"
-    out = file(filename, "w")
-    
-    for arch in ["i386","amd64","powerpc"]:
-        # init arch specific cache
-        apt_pkg.Config.Set("APT::Architecture",arch)
-        apt_pkg.Config.Set("Dir::state","./apt/")
-        apt_pkg.Config.Set("Dir::Etc","./apt")
-        cache = apt.Cache(apt.progress.OpProgress())
-        prog = apt.progress.FetchProgress()
-        cache.update(prog)
-        cache.open(apt.progress.OpProgress())
-        # now do the scan for this arch
-        if len(sys.argv) == 2:
-            scan(sys.argv[1],out)
-        else:
-            scan("mirror/archive.ubuntu.com/pool", out)
+
+    with open(filename, "w") as out:
+        for arch in ["i386","amd64","powerpc"]:
+            # init arch specific cache
+            apt_pkg.config.set("APT::Architecture",arch)
+            apt_pkg.config.set("Dir::state","./apt/")
+            apt_pkg.config.set("Dir::Etc","./apt")
+            cache = apt.Cache(apt.progress.base.OpProgress())
+            prog = apt.progress.base.AcquireProgress()
+            cache.update(prog)
+            cache.open(apt.progress.base.OpProgress())
+            # now do the scan for this arch
+            if len(sys.argv) == 2:
+                scan(sys.argv[1],out)
+            else:
+                scan("mirror/archive.ubuntu.com/pool", out)
     #scan("mirror/archive.ubuntu.com/pool/main/a")
     #scan("mirror/archive.ubuntu.com/pool/universe/c/command-not-found")
     #scan("mirror/archive.ubuntu.com/pool/main/g/gksu")

=== modified file 'UnifiedDataExtractor/verify_scan_data.py'
--- UnifiedDataExtractor/verify_scan_data.py	2011-08-10 13:02:29 +0000
+++ UnifiedDataExtractor/verify_scan_data.py	2012-06-13 16:12:19 +0000
@@ -4,6 +4,8 @@
 # Authors:
 #  Michael Vogt
 
+from __future__ import print_function
+
 import apt
 import apt_pkg
 import sys
@@ -11,30 +13,31 @@
 if __name__ == "__main__":
 
     if len(sys.argv) < 2:
-        print "need scan.data argument"
+        print("need scan.data argument")
         sys.exit(1)
 
     scandata = sys.argv[1]
-    apt_pkg.Config.Set("APT::Get::List-Cleanup", "false")
+    apt_pkg.config.set("APT::Get::List-Cleanup", "false")
     for arch in ("i386", "amd64"):
-        print "Starting verification for '%s'" % arch
-        apt_pkg.Config.Set("APT::Architecture", arch)
+        print("Starting verification for '%s'" % arch)
+        apt_pkg.config.set("APT::Architecture", arch)
         cache = apt.Cache(rootdir="./apt/")
         cache.update()
-        cache.open(apt.progress.OpProgress())
-        for line in open(scandata):
-            (march, comp, pkg, bin) = line.split("|")
-            if march != arch:
-                continue
-            # check if package is in cache
-            if not pkg in cache:
-                print "ERROR: '%s' is not in cache" % pkg
-                continue
-            # check if the component is correct
-            if not "/" in cache[pkg].section:
-                realcomp = "main"
-            else:
-                realcomp = cache[pkg].section.split("/")[0]
-            if comp != realcomp:
-                print "ERROR: '%s' is in wrong component (claims '%s' but is in '%s'" % (pkg, comp, realcomp)
-        print "done\n"
+        cache.open(apt.progress.base.OpProgress())
+        with open(scandata) as scanfile:
+            for line in scanfile:
+                (march, comp, pkg, bin) = line.split("|")
+                if march != arch:
+                    continue
+                # check if package is in cache
+                if not pkg in cache:
+                    print("ERROR: '%s' is not in cache" % pkg)
+                    continue
+                # check if the component is correct
+                if not "/" in cache[pkg].section:
+                    realcomp = "main"
+                else:
+                    realcomp = cache[pkg].section.split("/")[0]
+                if comp != realcomp:
+                    print("ERROR: '%s' is in wrong component (claims '%s' but is in '%s'" % (pkg, comp, realcomp))
+        print("done\n")

=== modified file 'bash_command_not_found'
--- bash_command_not_found	2008-03-07 09:21:09 +0000
+++ bash_command_not_found	2012-06-13 16:12:19 +0000
@@ -6,7 +6,7 @@
 
 command_not_found_handle() {
   if  [ -x /usr/lib/command-not-found ]; then
-     /usr/bin/python /usr/lib/command-not-found -- "$1" 
+     /usr/lib/command-not-found -- "$1" 
      return $?
   else
      return 127

=== modified file 'command-not-found'
--- command-not-found	2012-01-13 11:11:20 +0000
+++ command-not-found	2012-06-13 16:12:19 +0000
@@ -2,7 +2,7 @@
 # (c) Zygmunt Krynicki 2005, 2006, 2007, 2008
 # Licensed under GPL, see COPYING for the whole text
 
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 
 
 __version__ = "0.2.44"
@@ -22,7 +22,10 @@
 
 def enable_i18n():
     cnf = gettext.translation("command-not-found", fallback=True)
-    cnf.install(unicode=True)
+    kwargs = {}
+    if sys.version < '3':
+        kwargs["unicode"] = True
+    cnf.install(**kwargs)
     locale.setlocale(locale.LC_ALL, '')
 
 
@@ -53,7 +56,8 @@
 
 def main():
     enable_i18n()
-    fix_sys_argv()
+    if sys.version < '3':
+        fix_sys_argv()
     parser = LocaleOptionParser(
         version=__version__,
         usage=_("%prog [options] <command-name>"))
@@ -69,10 +73,8 @@
     (options, args) = parser.parse_args()
     if len(args) == 1:
         cnf = CommandNotFound(options.data_dir)
-        # 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) and not options.no_failure_msg:
-            print >>sys.stderr, _("%s: command not found") % args[0]
+        if not cnf.advise(args[0], options.ignore_installed) and not options.no_failure_msg:
+            print(_("%s: command not found") % args[0], file=sys.stderr)
 
 if __name__ == "__main__":
     crash_guard(main, BUG_REPORT_URL, __version__)