Merge lp:~barry/apturl/py3 into lp:apturl

[Barry Warsaw]

A working port to Python 3.

[Stéphane Graber (stgraber)]

Things that I can't easily check just through the proposal:
 - Does the package actually build? The concern here being the use of "python3 ./setup.py install --install-layout=deb"
 - "#desc = "%s\n\n%s" % (summary, Helpers.format_description(description))" in KDEui.py, why was that line commented rather than removed if "desc" isn't used?

Besides that, the rest looks good, so with an answer to these two, +1

review: Approve

[Barry Warsaw (barry)]

On Jun 12, 2012, at 10:42 PM, Stéphane Graber wrote:

>Things that I can't easily check just through the proposal:

> - Does the package actually build? The concern here being the use of "python3 ./setup.py install --install-layout=deb"

I'm testing this now, but it requires unreleased versions of update-manager
and aptdaemon, so it's a bit tricky. :) I certainly won't upload it until
both those are released and the apturl build is tested.

> - "#desc = "%s\n\n%s" % (summary, Helpers.format_description(description))" in KDEui.py, why was that line commented rather than removed if "desc" isn't used?

You can't tell from the diff, but there's other code commented out below that
references it. I suppose I should just remove all the commented out code
instead.

>Besides that, the rest looks good, so with an answer to these two, +1

Thanks!

[lp:~barry/apturl/py3]

133. By Barry Warsaw on 2012-06-13

+ Port setup.py to Python 3.
+ Fix python3-update-manager dependencies.
+ override_dh_auto_build to build with Python 3.
+ python3 setup.py install needs --root

[Barry Warsaw (barry)]

With the new uploads of update-manager and aptdaemon, this should be ready to go.

[lp:~barry/apturl/py3]

134. By Barry Warsaw on 2012-06-14

apturl now must require python3-aptdaemon.gtk3widgets (i.e. not |
synaptic) due to the Python 3 port of update-manager.

[Barry Warsaw (barry)]

<xnox> then why Except: #Python 3 [20:44]
<xnox> 204 - homepage = pkgobj.homepage
<xnox> 205 + try:
<xnox> 206 + homepage = pkgobj.homepage
<xnox> 207 + except AttributeError:
<xnox> 208 + # Python 3
<xnox> 209 + homepage = pkgobj.versions[0].homepage

<xnox> then I would expect universal_newlines=True in the Popen as well, if
       you were playing it safe ;-) [20:45]
<xnox> +from __future__ import print_function
<xnox> 460 - desc = "%s\n\n%s" % (summary,
       Helpers.format_description(description)) [20:46]
<xnox> 461 + #desc = "%s\n\n%s" % (summary,
       Helpers.format_description(description))
<xnox> intentional comment out?
<xnox> are we meant to install 597
       +usr/lib/python3/*-packages/apturl-*.egg-info ? [20:47]

<xnox> ok.
<xnox> barry: debian/compat == 8
<xnox> use 9
<xnox> 8 was really a temp thing.
<xnox> and precise has 9 [20:48]

[Barry Warsaw (barry)]

<cjwatson> barry: The new apt API exists for py2 as well, and it's important
           to port to it because the old one is slated to go away
<cjwatson> (given that the new one has been around since lucid)
<barry> cjwatson: agreed. i'll get rid of the old api
<barry> (or mostly the try/excepts around the old api calls) [20:52]
<cjwatson> (Also, pkgobj.candidate.homepage maybe?)

<cjwatson> + verStr = self.cache[apturl.package].candidate_version [20:53]
<cjwatson> that looks wrong, .candidate.version perhaps

[Barry Warsaw (barry)]

<cjwatson> + # be locked via apt_pkg.GetLock()
<cjwatson> whitespace change only here in a comment, but maybe update the
           comment to .get_lock()

[lp:~barry/apturl/py3]

135. By Barry Warsaw on 2012-06-14

Change debian/compat == 9

=== modified file 'AptUrl/AptUrl.py'
--- AptUrl/AptUrl.py	2012-06-11 20:34:59 +0000
+++ AptUrl/AptUrl.py	2012-06-14 00:37:19 +0000
@@ -20,17 +20,15 @@
 # along with AptUrl; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import sys
 import apt
 import apt_pkg
-import gettext
 
 import aptsources.distro
 from . import Parser
 from . import Helpers
 from .Helpers import _
 
-from aptsources.sourceslist import SourcesList, is_mirror
+from aptsources.sourceslist import SourcesList
 from optparse import OptionParser
 
 import os
@@ -55,8 +53,6 @@
         self.ui = ui
 
     def enableSection(self, apturl):
-        added = False
-
         # parse sources.list
         sourceslist = SourcesList()
         distro = aptsources.distro.get_distro()
@@ -74,7 +70,8 @@
         if not self.ui.askEnableSections(apturl.section):
             return RESULT_CANCELT
         if not self.ui.doEnableSection(apturl.section):
-            self.ui.error(_("Enabling '%s' failed") % ", ".join(apturl.section))
+            self.ui.error(_("Enabling '%s' failed") %
+                          ", ".join(apturl.section))
             return RESULT_ERROR
         self.ui.doUpdate()
         self.openCache()
@@ -114,9 +111,9 @@
                 raise
             self.ui.error(_("Invalid /etc/apt/sources.list file"), strerr)
             return False
-        if self.cache._depcache.BrokenCount > 0:
+        if self.cache._depcache.broken_count > 0:
             err_header = _("Software index is broken")
-            err_body = _("This is a major failure of your software " 
+            err_body = _("This is a major failure of your software "
                          "management system. Please check for broken packages "
                          "with synaptic, check the file permissions and "
                          "correctness of the file '/etc/apt/sources.list' and "
@@ -126,7 +123,7 @@
             self.ui.error(err_header, err_body)
             return False
         return True
-    
+
     def parseArgs(self):
         parser = OptionParser()
         parser.add_option("-p", "--http-proxy", dest="http_proxy",
@@ -151,15 +148,15 @@
                           str(e))
             return []
         return (apturl_list)
-        
+
     def verifyInstall(self, apturl):
         " verify that the install package actually is installed "
         # check if the package got actually installed
         self.openCache()
         pkg = self.cache[apturl.package]
-        if (not pkg.isInstalled or
-            pkg._pkg.CurrentState != apt_pkg.CurStateInstalled or
-            self.cache._depcache.BrokenCount > 0):
+        if (not pkg.is_installed or
+            pkg._pkg.current_state != apt_pkg.CURSTATE_INSTALLED or
+            self.cache._depcache.broken_count > 0):
             return False
         return True
 
@@ -167,12 +164,12 @@
         # global return code
         ret = RESULT_OK
         ui = self.ui
-        
+
         # parse arguments
         apturl_list = self.parseArgs()
         if not apturl_list:
             return RESULT_BADARGS
-        
+
         # open cache
         if not self.openCache():
             return RESULT_ERROR
@@ -183,7 +180,8 @@
             #        evalAptUrl()
 
             if not apturl.schema in ("apt", "apt+http"):
-                self.ui.error(_("Can not deal with protocol '%s' ") % apturl.schema)
+                self.ui.error(_("Can not deal with protocol '%s' ")
+                              % apturl.schema)
                 continue
 
             if apturl.section:
@@ -196,7 +194,7 @@
                 ui.doUpdate()
                 if not self.openCache():
                     return RESULT_ERROR
-            
+
             # now check the package
             if apturl.package not in self.cache:
                 try:
@@ -207,11 +205,14 @@
                     ui.error(_("Package '%s' is virtual.") % apturl.package)
                     continue
                 else:
-                    ui.error(_("Could not find package '%s'.") % apturl.package)
+                    ui.error(_("Could not find package '%s'.")
+                             % apturl.package)
                     continue
-            
-            if self.cache[apturl.package].isInstalled and apturl.minver is None:
-                ui.message(_("Package '%s' is already installed") % apturl.package)
+
+            if (self.cache[apturl.package].is_installed and
+                apturl.minver is None):
+                ui.message(_("Package '%s' is already installed")
+                           % apturl.package)
                 continue
 
             # ask the user
@@ -220,20 +221,21 @@
             if not ui.askInstallPackage(apturl.package, sum, desc, homepage):
                 ret = RESULT_CANCELT
                 continue
-            
+
             # try to install it
             try:
-                self.cache[apturl.package].markInstall()
+                self.cache[apturl.package].mark_install()
             except SystemError as e:
                 ui.error(_("Can not install '%s' (%s) ") % (apturl.package, e))
                 continue
             if apturl.minver is not None:
-                verStr = self.cache[apturl.package].candidateVersion
-                if apt_pkg.VersionCompare(verStr, apturl.minver) < 1:
-                    ui.error(_("Package '%s' requests minimal version '%s', but "
-                               "only '%s' is available") % (apturl.package,
-                                                            apturl.minver,
-                                                            verStr))
+                verStr = self.cache[apturl.package].candidate_version
+                if apt_pkg.version_compare(verStr, apturl.minver) < 1:
+                    ui.error(_(
+                        "Package '%s' requests minimal version '%s', but "
+                        "only '%s' is available") % (apturl.package,
+                                                     apturl.minver,
+                                                     verStr))
                     continue
 
             # install it
@@ -244,4 +246,3 @@
 
         # return values
         return ret
-            
 
=== modified file 'AptUrl/Helpers.py'
--- AptUrl/Helpers.py	2012-06-11 21:35:40 +0000
+++ AptUrl/Helpers.py	2012-06-14 00:37:19 +0000
@@ -39,25 +39,35 @@
         return str
 
 def get_dist():
-    return subprocess.Popen(["lsb_release","-c","-s"],stdout=subprocess.PIPE).communicate()[0].strip()
+    return subprocess.Popen(["lsb_release","-c","-s"],
+                            stdout=subprocess.PIPE).communicate()[0].strip()
 
 
 def parse_pkg(pkgobj):
     summary = ""
     description = ""
-    if pkgobj.description.count("\n") > 0:
-        summary, description = pkgobj.description.split('\n', 1)
+    try:
+        pkg_description = pkgobj.description
+    except AttributeError:
+        # Python 3
+        pkg_description = pkgobj.versions[0].description
+    if pkg_description.count("\n") > 0:
+        summary, description = pkg_description.split('\n', 1)
     else:
-        summary = pkgobj.description
+        summary = pkg_description
     lines = description.rstrip('\n').split('\n')
     if len(lines) > 1 and lines[-1].startswith('Homepage: '):
         homepage = lines[-1].split(' ', 1)[1]
         description = '\n'.join(lines[:-1])
     else:
-        homepage = pkgobj.homepage
+        try:
+            homepage = pkgobj.homepage
+        except AttributeError:
+            # Python 3
+            homepage = pkgobj.versions[0].homepage
     return (summary, description, homepage)
 
 def format_description(description):
-	const = 'APTURL_DOUBLE_EMPTY_LINE_PLACEHOLDER'
-	return description.replace('\n\n', const).replace('\n', ' ').replace(
-		const, '\n\n')
+    const = 'APTURL_DOUBLE_EMPTY_LINE_PLACEHOLDER'
+    return description.replace('\n\n', const).replace('\n', ' ').replace(
+        const, '\n\n')
 
=== modified file 'AptUrl/Parser.py'
--- AptUrl/Parser.py	2012-06-11 21:35:40 +0000
+++ AptUrl/Parser.py	2012-06-14 00:37:19 +0000
@@ -23,7 +23,6 @@
 import os
 import string
 from string import Template
-from subprocess import Popen, PIPE
 from .Helpers import get_dist
 from .Helpers import _
 
@@ -82,7 +81,8 @@
     " test if the url matches the internal whitelist "
     for char in raw_url:
         if not char in whitelist:
-            raise InvalidUrlException(raw_url, _("Non whitelist char in the uri"))
+            raise InvalidUrlException(
+                raw_url, _("Non whitelist char in the uri"))
     return True
 
 def set_value(apt_url, s):
 
=== modified file 'AptUrl/UI.py'
--- AptUrl/UI.py	2012-06-11 20:34:59 +0000
+++ AptUrl/UI.py	2012-06-14 00:37:19 +0000
@@ -1,5 +1,4 @@
 
-from . import Helpers
 from .Helpers import _, _n
 
 class AbstractUI(object):
 
=== modified file 'AptUrl/gtk/GtkUI.py'
--- AptUrl/gtk/GtkUI.py	2012-06-11 20:34:59 +0000
+++ AptUrl/gtk/GtkUI.py	2012-06-14 00:37:19 +0000
@@ -5,14 +5,11 @@
 from gi.repository import Gdk
 from gi.repository import GObject
 GObject.threads_init()
-import subprocess
+
+import os
 import sys
-
-import os
-import os.path
-
 import apt_pkg
-
+import subprocess
 
 from AptUrl.UI import AbstractUI
 from AptUrl import Helpers
@@ -20,13 +17,22 @@
 
 from .backend import get_backend
 
+
+APTURL_UI_FILE = os.environ.get(
+    # Set this envar to use a test .ui file.
+    'APTURL_UI_FILE',
+    # System file to use if the envar is not set.
+    '/usr/share/apturl/apturl-gtk.ui'
+    )
+
+
 class GtkUI(AbstractUI):
     def __init__(self):
         Gtk.init_check(sys.argv)
         # create empty dialog
         self.dia_xml = Gtk.Builder()
         self.dia_xml.set_translation_domain("apturl")
-        self.dia_xml.add_from_file('/usr/share/apturl/apturl-gtk.ui')
+        self.dia_xml.add_from_file(APTURL_UI_FILE)
         self.dia = self.dia_xml.get_object('confirmation_dialog')
         self.dia.realize()
         self.backend = get_backend(self.dia)
@@ -37,7 +43,8 @@
         Gtk.main_quit()
 
     # generic dialogs
-    def _get_dialog(self, dialog_type, summary, msg="", buttons=Gtk.ButtonsType.CLOSE):
+    def _get_dialog(self, dialog_type, summary, msg="",
+                    buttons=Gtk.ButtonsType.CLOSE):
         " internal helper for dialog construction "
         d = Gtk.MessageDialog(parent=self.dia,
                               flags=Gtk.DialogFlags.MODAL,
@@ -50,7 +57,7 @@
         d.realize()
         d.get_window().set_functions(Gdk.WMFunction.MOVE)
         return d
-        
+
     def error(self, summary, msg=""):
         d = self._get_dialog(Gtk.MessageType.ERROR, summary, msg)
         d.run()
@@ -73,7 +80,7 @@
         if res != Gtk.ResponseType.YES:
             return False
         return True
-    
+
     # specific dialogs
     def askEnableChannel(self, channel, channel_info_html):
         summary = _("Enable additional software channel")
@@ -115,7 +122,7 @@
             return False
         return True
 
-    
+
     def doEnableChannel(self, channelpath, channelkey):
         cmd = ["gksu",
                "--desktop", "/usr/share/applications/gnome-app-install.desktop",
@@ -155,25 +162,25 @@
         tbuf.set_text(desc)
         description_text_view.set_buffer(tbuf)
         dia.set_icon(Gtk.IconTheme.get_default().load_icon('deb', 16, False))
-        
+
         # check if another package manager is already running
         # FIXME: just checking for the existance of the file is
         #        not sufficient, it need to be tested if it can
-        #        be locked via apt_pkg.GetLock() 
-        #        - but that needs to run as root 
+        #        be locked via apt_pkg.GetLock()
+        #        - but that needs to run as root
         #        - a dbus helper might be the best answer here
         #args = (update_button_status, dia_xml.get_object("yes_button"),
         #    dia_xml.get_object("infolabel"))
         #args[0](*args[1:])
         #timer_id = GObject.timeout_add(750, *args )
-        
+
         # show the dialog
         res = dia.run()
         #GObject.source_remove(timer_id)
         if res != Gtk.ResponseType.YES:
             dia.hide()
             return False
-        
+
         # don't set on-top while installing
         dia.set_keep_above(False)
         return True
 
=== modified file 'AptUrl/gtk/backend/__init__.py'
--- AptUrl/gtk/backend/__init__.py	2011-07-22 12:04:26 +0000
+++ AptUrl/gtk/backend/__init__.py	2012-06-14 00:37:19 +0000
@@ -45,7 +45,7 @@
         not "UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC" in os.environ):
         # check if the gtkwidgets are installed as well
         try:
-            from InstallBackendAptdaemon import InstallBackendAptdaemon
+            from .InstallBackendAptdaemon import InstallBackendAptdaemon
             return InstallBackendAptdaemon(*args, **kwargs)
         except ImportError:
             import logging
@@ -53,7 +53,7 @@
     # try synaptic
     if (os.path.exists("/usr/sbin/synaptic") and
         not "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" in os.environ):
-        from InstallBackendSynaptic import InstallBackendSynaptic
+        from .InstallBackendSynaptic import InstallBackendSynaptic
         return InstallBackendSynaptic(*args, **kwargs)
     # nothing found, raise
     raise Exception("No working backend found, please try installing "
 
=== modified file 'AptUrl/kde/KdeUI.py'
--- AptUrl/kde/KdeUI.py	2012-06-11 20:34:59 +0000
+++ AptUrl/kde/KdeUI.py	2012-06-14 00:37:19 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import print_funcion
+from __future__ import print_function
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -9,19 +9,20 @@
 from PyKDE4.kdeui import *
 from PyKDE4.kdecore import *
 
-import subprocess
-from tempfile import NamedTemporaryFile
-
 import os
-import os.path
-
-import time
-import thread
 import apt_pkg
+import subprocess
 
 from AptUrl.UI import AbstractUI
-from AptUrl import Helpers
-from AptUrl.Helpers import utf8, _, _n
+from AptUrl.Helpers import _
+
+APTURL_UI_FILE = os.environ.get(
+    # Set this envar to use a test .ui file.
+    'APTURL_UI_FILE',
+    # System file to use if the envar is not set.
+    '/usr/share/apturl/apturl-qt.ui'
+    )
+
 
 class AptUrlDialog(KDialog):
     def __init__(self,parent=None):
@@ -34,6 +35,7 @@
         else:
             KDialog.reject(self)
 
+
 class KdeUI(AbstractUI):
     def __init__(self):
         self.dialog = AptUrlDialog()
@@ -41,7 +43,7 @@
         self.d = QWidget(self.dialog)
         self.dialog.setMainWidget(self.d)
 
-        uic.loadUi('/usr/share/apturl/apturl-qt.ui', self.d)
+        uic.loadUi(APTURL_UI_FILE, self.d)
         self.d.image_label.setPixmap(KIcon("application-x-deb").pixmap(64,64))
 
     # generic dialogs
@@ -97,7 +99,8 @@
                "software-properties-kde",
                "--enable-component", "%s" % ' '.join(sections)]
         try:
-            output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
+            output = subprocess.Popen(
+                cmd, stdout=subprocess.PIPE).communicate()[0]
         except OSError as e:
             print("Execution failed: %s" % e, file=sys.stderr)
             return True
@@ -129,7 +132,7 @@
     def askInstallPackage(self, package, summary, description, homepage):
         header = "<h2>" + _("Install additional software?") + "</h2>"
         body = _("Do you want to install package '%s'?") % package
-        desc = "%s\n\n%s" % (summary, Helpers.format_description(description))
+        #desc = "%s\n\n%s" % (summary, Helpers.format_description(description))
 
         self.d.header_label.setText(header)
         self.d.body_label.setText(body)
@@ -145,36 +148,19 @@
 
     # progress etc
     def doUpdate(self):
-        p = subprocess.Popen(['qapt-batch',
-                              '--attach', str(self.dialog.winId()),
-                              '--update'
-                              ])
-        self._wait_for_install_package(p)
+        subprocess.check_call([
+            'qapt-batch',
+            '--attach', str(self.dialog.winId()),
+            '--update'
+            ])
 
     def doInstall(self, apturl):
-        p = subprocess.Popen(['qapt-batch',
-                              '--attach', str(self.dialog.winId()),
-                              '--install',
-                              apturl.package
-                              ])
-        self._wait_for_install_package(p)
-        return True
-
-    # helpers
-    def _wait_for_p(self, p, lock):
-        " helper for the thread to wait for process p to finish "
-        p.wait()
-        lock.release()
-
-    def _wait_for_install_package(self, p):
-        # wait for qapt-batch
-        lock = thread.allocate_lock()
-        lock.acquire()
-        thread.start_new_thread(self._wait_for_p, (p, lock))
-
-        while lock.locked():
-            time.sleep(0.01)
-        return True
+        subprocess.check_call([
+            'qapt-batch',
+            '--attach', str(self.dialog.winId()),
+            '--install',
+            apturl.package
+            ])
 
 
 if __name__ == "__main__":
 
=== modified file 'apturl-gtk'
--- apturl-gtk	2012-06-11 20:34:59 +0000
+++ apturl-gtk	2012-06-14 00:37:19 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # Copyright (c) 2007-2008 Canonical
 #
@@ -22,13 +22,12 @@
 # along with AptUrl; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+from __future__ import print_function
 
 # ignore apt's "API not stable yet" warning
 import warnings
 warnings.filterwarnings("ignore", category=FutureWarning, append=1)
 
-from __future__ import print_function
-
 import sys
 import gettext
 from gettext import gettext as _
 
=== modified file 'apturl-kde'
--- apturl-kde	2012-06-11 20:34:59 +0000
+++ apturl-kde	2012-06-14 00:37:19 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 #
 # Copyright © 2009 Harald Sitter <[e-mail]>
@@ -22,13 +22,12 @@
 # along with AptUrl; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+from __future__ import print_function
 
 # ignore apt's "API not stable yet" warning
 import warnings
 warnings.filterwarnings("ignore", category=FutureWarning, append=1)
 
-from __future__ import print_function
-
 import sys
 import gettext
 from gettext import gettext as _
@@ -58,18 +57,18 @@
 if __name__ == "__main__":
     appName     = "apturl"
     catalog     = ""
-    programName = ki18n ("AptUrl")
+    programName = ki18n (b"AptUrl")
     version     = "1.0"
-    description = ki18n ("AptUrl for Kubuntu")
+    description = ki18n (b"AptUrl for Kubuntu")
     license     = KAboutData.License_GPL
-    copyright   = ki18n ("© Harald Sitter")
-    text        = ki18n ("none")
+    copyright   = ki18n ("© Harald Sitter".encode('utf-8'))
+    text        = ki18n (b"none")
     homePage    = "http://www.kubuntu.org/"
     bugEmail    = ""
 
     about = KAboutData (appName, catalog, programName, version, description,
                         license, copyright, text, homePage, bugEmail)
-    about.addAuthor(ki18n("Harald Sitter"), KLocalizedString(),
+    about.addAuthor(ki18n(b"Harald Sitter"), KLocalizedString(),
         "[e-mail]")
     KCmdLineArgs.init([""],about)
 
 
=== modified file 'debian/apturl-common.install'
--- debian/apturl-common.install	2011-03-30 13:46:50 +0000
+++ debian/apturl-common.install	2012-06-14 00:37:19 +0000
@@ -1,7 +1,7 @@
 etc/
 usr/bin/apturl
-usr/lib/python2.?/*-packages/AptUrl/*py*
-usr/lib/python2.?/*-packages/apturl-*.egg-info
+usr/lib/python3/*-packages/AptUrl/*py*
+usr/lib/python3/*-packages/apturl-*.egg-info
 usr/share/kde4/services
 usr/share/locale
 usr/share/applications
 
=== modified file 'debian/apturl-kde.install'
--- debian/apturl-kde.install	2010-12-17 14:42:22 +0000
+++ debian/apturl-kde.install	2012-06-14 00:37:19 +0000
@@ -1,3 +1,3 @@
 usr/bin/apturl-kde
-usr/lib/python2.?/*-packages/AptUrl/kde/*py*
+usr/lib/python3/*-packages/AptUrl/kde/*py*
 usr/share/apturl/*-qt.ui
 
=== modified file 'debian/apturl.install'
--- debian/apturl.install	2011-07-22 12:04:26 +0000
+++ debian/apturl.install	2012-06-14 00:37:19 +0000
@@ -1,5 +1,5 @@
 usr/bin/apturl-gtk
-usr/lib/python2.?/*-packages/AptUrl/gtk/*py*
-usr/lib/python2.?/*-packages/AptUrl/gtk/backend/
+usr/lib/python3/*-packages/AptUrl/gtk/*py*
+usr/lib/python3/*-packages/AptUrl/gtk/backend/
 usr/share/apturl/*-gtk.ui
 usr/share/gconf
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-06-12 16:09:13 +0000
+++ debian/changelog	2012-06-14 00:37:19 +0000
@@ -12,6 +12,27 @@
       to avoid attempts to destroy it without a thread context.
     - Open temporary synaptic selections file in text mode.
 
+  [ Barry Warsaw ]
+  * Additional Python 3 fixes:
+    + Port setup.py to Python 3.
+    + Use the new python-apt API since the legacy API is not available in
+      Python 3.
+    + ki18n() takes bytes.
+    + Fix relative imports so the code can be run from source.
+    + Fixed some additional packaging paths.
+    + Fix typos in __future__ imports.
+    + Change #! lines to use python3.
+    + Changed debian/control and debian/rules to use python3.
+    + Change debian/compat == 8
+    + apturl now must require python3-aptdaemon.gtk3widgets (i.e. not |
+      synaptic) due to the Python 3 port of update-manager.
+  * Other changes:
+    + Remove the need for threads in the KDE front-end.
+    + Enable running the test suite via `python3 -m unittest discover`
+    + i18n updates.
+    + Various and sundry pyflakes, whitespace, style, line length, and
+      spelling fixes.
+
  -- Brian Murray <[e-mail]>  Mon, 11 Jun 2012 10:32:52 -0700
 
 apturl (0.5.1ubuntu3) precise; urgency=low
 
=== modified file 'debian/compat'
--- debian/compat	2009-09-10 11:45:36 +0000
+++ debian/compat	2012-06-14 00:37:19 +0000
@@ -1,1 +1,1 @@
-7
+8
 
=== modified file 'debian/control'
--- debian/control	2012-03-13 18:45:45 +0000
+++ debian/control	2012-06-14 00:37:19 +0000
@@ -2,23 +2,26 @@
 Section: admin
 Priority: optional
 Maintainer: Michael Vogt <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8),
  intltool,
- python-dev,
- python-distutils-extra
-XS-Python-Version: current
+ python3-dev,
+ python3-distutils-extra,
+ python3-update-manager,
+ python3-aptdaemon
+X-Python3-Version: >= 3.2
 Standards-Version: 3.9.1
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/apturl/ubuntu/
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-core-dev/apturl/ubuntu/files
 
 Package: apturl-common
 Architecture: any
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
  ${shlibs:Depends},
  ${misc:Depends},
- python-apt
+ python3-apt,
+ python3-update-manager,
+ python3-aptdaemon
 Replaces: apturl (<< 0.3.6ubuntu2)
-XB-Python-Version: ${python:Versions}
 Description: install packages using the apt protocol - common data
  AptUrl is a simple graphical application that takes an URL (which follows the
  apt-protocol) as a command line option, parses it and carries out the
@@ -30,18 +33,17 @@
 
 Package: apturl
 Architecture: any
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
  ${shlibs:Depends},
  ${misc:Depends},
  apturl-common (= ${binary:Version}),
  gnome-icon-theme (>= 2.14.0-1),
- python-gi,
+ python3-gi,
  software-properties-gtk,
- python-aptdaemon.gtk3widgets | synaptic,
+ python3-aptdaemon.gtk3widgets,
  gir1.2-gtk-3.0,
  gir1.2-webkit-3.0
 Recommends: libgtk2-perl (>= 1:1.130)
-XB-Python-Version: ${python:Versions}
 Description: install packages using the apt protocol - GTK+ frontend
  AptUrl is a simple graphical application that takes an URL (which follows the
  apt-protocol) as a command line option, parses it and carries out the
@@ -53,16 +55,15 @@
 
 Package: apturl-kde
 Architecture: any
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
  ${shlibs:Depends},
  ${misc:Depends},
- python-qt4,
- python-kde4,
+ python3-pyqt4,
+ python3-pykde4,
  apturl-common (= ${binary:Version}),
  kdesudo,
  qapt-batch,
  software-properties-kde (>= 0.75.2)
-XB-Python-Version: ${python:Versions}
 Description: install packages using the apt protocol - KDE frontend
  AptUrl is a simple graphical application that takes an URL (which follows the
  apt-protocol) as a command line option, parses it and carries out the
 
=== removed file 'debian/pycompat'
--- debian/pycompat	2007-07-02 09:31:04 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2
 \ No newline at end of file
 
=== modified file 'debian/rules'
--- debian/rules	2010-12-17 14:42:22 +0000
+++ debian/rules	2012-06-14 00:37:19 +0000
@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
 %:
-	dh --with python2 $@
+	dh $@ --with python3
 
 override_dh_auto_clean:
 	rm -f AptUrl/Version.py
 
+override_dh_auto_build:
+	python3 setup.py build
+
 override_dh_auto_install:
-	python ./setup.py install --prefix=$(CURDIR)/debian/tmp/usr
+	python3 ./setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
 
-override_dh_install:
-	dh_install --sourcedir=debian/tmp --fail-missing
+override_dh_auto_test:
+	python3 -m unittest discover -vv
 
 
 PKG=apturl
 
=== modified file 'po/apturl.pot'
--- po/apturl.pot	2009-01-08 19:46:00 +0000
+++ po/apturl.pot	2012-06-14 00:37:19 +0000
@@ -8,47 +8,52 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-08 20:26+0100\n"
+"POT-Creation-Date: 2012-06-12 17:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../apturl:50
+#: ../apturl-gtk:51 ../apturl-kde:54
 msgid "User requested interrupt."
 msgstr ""
 
-#: ../AptUrl/Parser.py:79
+#: ../AptUrl/Parser.py:85
 msgid "Non whitelist char in the uri"
 msgstr ""
 
-#: ../AptUrl/Parser.py:91
-msgid "No ':' in the uri"
-msgstr ""
-
-#: ../AptUrl/Parser.py:117
+#: ../AptUrl/Parser.py:93
 msgid "Whitespace in key=value"
 msgstr ""
 
-#: ../AptUrl/Parser.py:123
+#: ../AptUrl/Parser.py:99
 #, python-format
 msgid "Exception '%s'"
 msgstr ""
 
-#: ../AptUrl/AptUrl.py:78
+#: ../AptUrl/Parser.py:109
+#, python-format
+msgid "Url string '%s' too long"
+msgstr ""
+
+#: ../AptUrl/Parser.py:115
+msgid "No ':' in the uri"
+msgstr ""
+
+#: ../AptUrl/AptUrl.py:73
 #, python-format
 msgid "Enabling '%s' failed"
 msgstr ""
 
-#: ../AptUrl/AptUrl.py:94
+#: ../AptUrl/AptUrl.py:91
 #, python-format
 msgid "Unknown channel '%s'"
 msgstr ""
 
-#: ../AptUrl/AptUrl.py:95
+#: ../AptUrl/AptUrl.py:92
 #, python-format
 msgid "The channel '%s' is not known"
 msgstr ""
@@ -88,74 +93,70 @@
 msgid "Can not deal with protocol '%s' "
 msgstr ""
 
-#: ../AptUrl/AptUrl.py:202
+#: ../AptUrl/AptUrl.py:205
 #, python-format
 msgid "Package '%s' is virtual."
 msgstr ""
 
-#: ../AptUrl/AptUrl.py:205
+#: ../AptUrl/AptUrl.py:208
 #, python-format
 msgid "Could not find package '%s'."
 msgstr ""
 
-#: ../AptUrl/AptUrl.py:209
+#: ../AptUrl/AptUrl.py:214
 #, python-format
 msgid "Package '%s' is already installed"
 msgstr ""
 
-#: ../AptUrl/AptUrl.py:223
+#: ../AptUrl/AptUrl.py:229
 #, python-format
 msgid "Can not install '%s' (%s) "
 msgstr ""
 
-#: ../AptUrl/AptUrl.py:228
+#: ../AptUrl/AptUrl.py:235
 #, python-format
 msgid "Package '%s' requests minimal version '%s', but only '%s' is available"
 msgstr ""
 
-#: ../AptUrl/UI.py:17
+#: ../AptUrl/UI.py:16
 msgid "Enable additional components"
 msgstr ""
 
-#: ../AptUrl/UI.py:18
-#, python-format
-msgid "Do you want to enable the following component: '%s'?"
-msgid_plural "Do you want to enable the following components: '%s'?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../AptUrl/UI.py:25
+#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:86 ../AptUrl/kde/KdeUI.py:82
 msgid "Enable additional software channel"
 msgstr ""
 
-#: ../AptUrl/UI.py:26
+#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:87 ../AptUrl/kde/KdeUI.py:83
 #, python-format
 msgid "Do you want to enable the following software channel: '%s'?"
 msgstr ""
 
-#: ../AptUrl/gtk/GtkUI.py:117
+#: ../AptUrl/gtk/GtkUI.py:151 ../AptUrl/kde/KdeUI.py:133
 msgid "Install additional software?"
 msgstr ""
 
-#: ../AptUrl/gtk/GtkUI.py:118
+#: ../AptUrl/gtk/GtkUI.py:152 ../AptUrl/kde/KdeUI.py:134
 #, python-format
 msgid "Do you want to install package '%s'?"
 msgstr ""
 
-#: ../data/apturl.glade.h:1
+#. kate: space-indent on; indent-width 4; mixedindent off; indent-mode python;
+#: ../data/apturl-gtk.ui.h:1
 msgid "Description"
 msgstr ""
 
-#: ../data/apturl.glade.h:2
+#: ../data/apturl-gtk.ui.h:2
 msgid "_Install"
 msgstr ""
 
 #: ../data/apturl.schemas.in.h:1
-msgid "Run the command in a terminal"
+msgid "Whether the specified command should handle \"apt\" URLs"
 msgstr ""
 
 #: ../data/apturl.schemas.in.h:2
-msgid "The command used to handle \"apt\" URLs, if enabled."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"apt\" "
+"URLs."
 msgstr ""
 
 #: ../data/apturl.schemas.in.h:3
@@ -163,17 +164,15 @@
 msgstr ""
 
 #: ../data/apturl.schemas.in.h:4
-msgid ""
-"True if the command specified in the \"command\" key should handle \"apt\" "
-"URLs."
+msgid "The command used to handle \"apt\" URLs, if enabled."
 msgstr ""
 
 #: ../data/apturl.schemas.in.h:5
+msgid "Run the command in a terminal"
+msgstr ""
+
+#: ../data/apturl.schemas.in.h:6
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-
-#: ../data/apturl.schemas.in.h:6
-msgid "Whether the specified command should handle \"apt\" URLs"
-msgstr ""
 
=== modified file 'setup.py'
--- setup.py	2011-07-22 12:04:26 +0000
+++ setup.py	2012-06-14 00:37:19 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from distutils.core import setup
 from DistUtilsExtra.command import *
@@ -9,13 +9,13 @@
 # look/set what version we have
 changelog = "debian/changelog"
 if os.path.exists(changelog):
-    head = open(changelog).readline()
+    with open(changelog, encoding='utf-8') as fp:
+        head = fp.readline()
     match = re.compile(".*\((.*)\).*").match(head)
     if match:
         version = match.group(1)
-        f = open("AptUrl/Version.py", "w")
-        f.write("VERSION=\"%s\"\n" % version)
-        f.close()
+        with open("AptUrl/Version.py", "w") as fp:
+            print('VERSION="{}"'.format(version))
 
 GETTEXT_NAME="apturl"
 I18NFILES = []
 
=== added file 'tests/__init__.py'
=== renamed file 'tests/apturlparse.py' => 'tests/test_apturl_parse.py'
--- tests/apturlparse.py	2012-06-11 20:34:59 +0000
+++ tests/test_apturl_parse.py	2012-06-14 00:37:19 +0000
@@ -1,17 +1,13 @@
-#!/usr/bin/python
-
 from __future__ import print_function
 
-import sys
-sys.path.insert(0, "../")
-
 import unittest
+
 from AptUrl import Parser
 
 
-class TestUrl(unittest.TestCase):
+class UrlTests(unittest.TestCase):
     mapping = { 'kernel':"2.6.23-17-generic",
-                     'distro':"hardy" }
+                'distro':"hardy" }
 
     testValues = ( ('apt:3ddesktop', [{'package':'3ddesktop',
                                       'schema': 'apt'}] ),
@@ -32,11 +28,11 @@
                    ('apt:2vcard?minver=1.0',
                     [{'package':'2vcard', 'schema': 'apt',
                      'minver': '1.0' }]),
-                   ('apt:owl,newbiedoc,python-pykaraoke?dist=gutsy', 
+                   ('apt:owl,newbiedoc,python-pykaraoke?dist=gutsy',
                     [{'package':'owl', 'schema':'apt'},
                     {'package':'newbiedoc', 'schema':'apt'},
                     {'package':'python-pykaraoke', 'schema':'apt', 'dist':'gutsy'}]),
-                   ('apt:python-pykaraoke?dist=gutsy,owl,newbiedoc', 
+                   ('apt:python-pykaraoke?dist=gutsy,owl,newbiedoc',
                     [{'package':'python-pykaraoke', 'schema':'apt', 'dist':'gutsy'},
                     {'package':'owl', 'schema':'apt'},
                     {'package':'newbiedoc', 'schema':'apt'}]),
@@ -60,20 +56,16 @@
                                       }]),
                  )
 
-    def testValidParse(self):
-        for (v, e) in self.testValues:
-            print("Testing: '%s'" % v)
+    def test_valid_parse(self):
+        for v, e in self.testValues:
+            #print("Testing: '%s'" % v)
             result_list = Parser.parse(v, self.mapping)
             for dictionary in e:
                 for key in dictionary:
                     self.assertEqual(getattr(result_list[e.index(dictionary)],
-                        key), dictionary[key])
+                                             key), dictionary[key])
 
     def test_pkgname_too_long(self):
         self.assertRaises(
             Parser.InvalidUrlException, Parser.parse,
             "apt:" + 100 * "veryverylong")
-
-
-if __name__ == "__main__":
-    unittest.main()
 
=== modified file 'tests/test_helpers.py'
--- tests/test_helpers.py	2012-06-11 21:35:40 +0000
+++ tests/test_helpers.py	2012-06-14 00:37:19 +0000
@@ -1,24 +1,17 @@
-#!/usr/bin/python
-
-import sys
-sys.path.insert(0, "../")
-
 import unittest
+
 from AptUrl.Helpers import parse_pkg
 
+
 class MockPkg(object):
     def __init__(self, descr):
         self.description = descr
         self.homepage = None
 
-class testHelpers(unittest.TestCase):
 
+class HelpersTest(unittest.TestCase):
     def test_parse_pkg(self):
         pkgobj = MockPkg("summary\ndescr\n")
         self.assertEqual(parse_pkg(pkgobj), ('summary','descr\n',None))
         pkgobj = MockPkg("summary only")
         self.assertEqual(parse_pkg(pkgobj), ('summary only','',None))
-
-if __name__ == "__main__":
-    unittest.main()
-