Merge lp:~brian-murray/update-notifier/python3 into lp:update-notifier/ubuntu

[Brian Murray]

Porting of update-notifier to python3.

This is also dependent on python3-debian being available.

[Adam Conrad (adconrad)]

Looks good to me, with the latest revision.

review: Approve

[Steve Langasek (vorlon)]

+ outstream.write("\n".join(map([p.name for p in pkgs])))

isn't the map() redundant here?

-SYNPATIC_DESKTOP = ["--desktop",
- "/usr/share/applications/synaptic.desktop",
+SYNPATIC_DESKTOP = ["--desktop",
+ "/usr/share/applications/synaptic.desktop",

Unrelated, but I guess the variable name could be spell-checked :)

There's one point in the data/package-data-downloader massive PEP8 fix-up (sorry about that) where I notice the indent level has changed (a couple of lines that were outside of 'with' blocks have been moved into them). That one's an ok no-op, but it makes me wonder if there are any others hiding in the large diff. Was the PEP8 reformatting of the file done automatically, or by hand? I don't think an eyeball review of the diff is useful to catch any bugs here, so we should probably rely on a sane automatic transformation.

review: Approve

[Steve Langasek (vorlon)]

Merge conflict from landing the PEP8 whitespace changes separately on each branch; should be resolved so we can review.

review: Needs Fixing

[Brian Murray (brian-murray)]

My local diff of package-data-downloader is only showing the following:

--- ../main/data/package-data-downloader 2012-06-13 15:54:04.000000000 -0700
+++ data/package-data-downloader 2012-06-13 15:51:18.000000000 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 """Process new requests to download per-package data"""
 # Copyright (C) 2012 Canonical Ltd
@@ -16,13 +16,15 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+from __future__ import print_function
+
 import glob
 import os
 import sys
 import subprocess
 import re
 import traceback
-import urllib
+import urllib.request
 import debian.deb822
 import string
 import apt
@@ -184,7 +186,7 @@ def process_download_requests():
                 pass

         if proxies:
- urllib._urlopener = urllib.FancyURLopener(proxies)
+ urllib.request._urlopener = urllib.request.FancyURLopener(proxies)
     except Exception:
         pass

@@ -209,13 +211,13 @@ def process_download_requests():
         files = []
         sums = []
         for para in hook.iter_paragraphs(open(file)):
- if para.has_key('script'):
+ if 'script' in para:
                 if not files:
                     record_failure(relfile)
                     break
                 command = [para['script']]

- if para.has_key('should-download'):
+ if 'should-download' in para:
                     db = debconf.DebconfCommunicator('update-notifier')
                     try:
                         should = db.get(para['should-download'])
@@ -230,8 +232,8 @@ def process_download_requests():
                 # Download each file and verify the sum
                 try:
                     for i in range(len(files)):
- print "%s: downloading %s" % (relfile, files[i])
- dest_file = urllib.urlretrieve(files[i])[0]
+ print("%s: downloading %s" % (relfile, files[i]))
+ dest_file = urllib.request.urlretrieve(files[i])[0]
                         output = subprocess.check_output(["sha256sum", dest_file])
                         output = output.split(' ')[0]
                         if output == sums[i]:

I hope that Launchpad is just slow here.

[lp:~brian-murray/update-notifier/python3]

716. By Brian Murray on 2012-06-14

merge with upstream

=== modified file 'data/apt_check.py'
--- data/apt_check.py	2012-06-12 09:09:32 +0000
+++ data/apt_check.py	2012-06-14 22:18:20 +0000
@@ -1,5 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
+from __future__ import print_function
 
 #nice apt-get -s -o Debug::NoLocking=true upgrade | grep ^Inst 
 
@@ -15,27 +16,32 @@
 DISTRO = subprocess.Popen(["lsb_release","-c","-s"],
                           stdout=subprocess.PIPE).communicate()[0].strip()
 
+
 def _(msg):
     return gettext.dgettext("update-notifier", msg)
 
+
 def _handleException(type, value, tb):
     sys.stderr.write("E: "+ _("Unknown Error: '%s' (%s)") % (type,value))
     sys.exit(-1)
 
-def clean(cache,depcache):
+
+def clean(cache, depcache):
     " unmark (clean) all changes from the given depcache "
     # mvo: looping is too inefficient with the new auto-mark code
     #for pkg in cache.Packages:
     #    depcache.MarkKeep(pkg)
     depcache.init()
 
-def saveDistUpgrade(cache,depcache):
+
+def saveDistUpgrade(cache, depcache):
     """ this functions mimics a upgrade but will never remove anything """
     depcache.upgrade(True)
     if depcache.del_count > 0:
-        clean(cache,depcache)
+        clean(cache, depcache)
     depcache.upgrade()
 
+
 def isSecurityUpgrade(ver):
     " check if the given version is a security update (or masks one) "
     security_pockets = [("Ubuntu", "%s-security" % DISTRO),
@@ -48,12 +54,13 @@
                 return True
     return False
 
+
 def write_package_names(outstream, cache, depcache):
     " write out package names that change to outstream "
-    pkgs = filter(lambda pkg:
-                  depcache.marked_install(pkg) or depcache.marked_upgrade(pkg),
-                  cache.packages)
-    outstream.write("\n".join(map(lambda p: p.name, pkgs)))
+    pkgs = [pkg for pkg in cache.packages if depcache.marked_install(pkg) or
+        depcache.marked_upgrade(pkg)]
+    outstream.write("\n".join(map([p.name for p in pkgs])))
+
 
 def write_human_readable_summary(outstream, upgrades, security_updates):
     " write out human summary summary to outstream "
@@ -67,6 +74,8 @@
                             "%i updates are security updates.",
                             security_updates)  % security_updates)
     outstream.write("\n")
+
+
 def init():
     " init the system, be nice "
     # FIXME: do a ionice here too?
@@ -74,24 +83,25 @@
     apt_pkg.init()
     # force apt to build its caches in memory for now to make sure
     # that there is no race when the pkgcache file gets re-generated
-    apt_pkg.config.set("Dir::Cache::pkgcache","")
-    
+    apt_pkg.config.set("Dir::Cache::pkgcache", "")
+
+
 def run(options=None):
 
     # we are run in "are security updates installed automatically?"
     # question mode
     if options.security_updates_unattended:
         res = apt_pkg.config.find_i("APT::Periodic::Unattended-Upgrade", 0)
-        #print res
+        #print(res)
         sys.exit(res)
 
     # get caches
     try:
         cache = apt_pkg.Cache(apt.progress.base.OpProgress())
-    except SystemError, e:
+    except SystemError as e:
         sys.stderr.write("E: "+ _("Error: Opening the cache (%s)") % e)
         sys.exit(-1)
-    depcache = apt_pkg.DepCache(cache)
+    depcache = apt_pkg.GetDepCache(cache)
 
     # read the pin files
     depcache.read_pinfile()
@@ -108,8 +118,8 @@
 
     # do the upgrade (not dist-upgrade!)
     try:
-        saveDistUpgrade(cache,depcache)
-    except SystemError, e:
+        saveDistUpgrade(cache, depcache)
+    except SystemError as e:
         sys.stderr.write("E: "+ _("Error: Marking the upgrade (%s)") % e)
         sys.exit(-1)
 
@@ -128,16 +138,16 @@
             continue
 
         # check for security upgrades
-        upgrades = upgrades + 1	
+        upgrades = upgrades + 1
         if isSecurityUpgrade(cand_ver):
             security_updates += 1
             continue
 
-        # now check for security updates that are masked by a 
+        # now check for security updates that are masked by a
         # canidate version from another repo (-proposed or -updates)
         for ver in pkg.version_list:
             if (inst_ver and apt_pkg.version_compare(ver.ver_str, inst_ver.ver_str) <= 0):
-                #print "skipping '%s' " % ver.VerStr
+                #print("skipping '%s' " % ver.VerStr)
                 continue
             if isSecurityUpgrade(ver):
                 security_updates += 1
@@ -149,19 +159,19 @@
     elif options and options.readable_output:
         write_human_readable_summary(sys.stdout, upgrades, security_updates)
     else:
-        # print the number of regular upgrades and the number of 
+        # print the number of regular upgrades and the number of
         # security upgrades
-        sys.stderr.write("%s;%s" % (upgrades,security_updates))
+        sys.stderr.write("%s;%s" % (upgrades, security_updates))
 
     # return the number of upgrades (if its used as a module)
-    return(upgrades,security_updates)
-
-
-if __name__ == "__main__":        
+    return(upgrades, security_updates)
+
+
+if __name__ == "__main__":
     # setup a exception handler to make sure that uncaught stuff goes
     # to the notifier
     sys.excepthook = _handleException
-    
+
     # gettext
     APP="update-notifier"
     DIR="/usr/share/locale"

=== modified file 'data/backend_helper.py'
--- data/backend_helper.py	2011-08-10 13:54:37 +0000
+++ data/backend_helper.py	2012-06-14 22:18:20 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import argparse
 import dbus
@@ -8,8 +8,8 @@
 import sys
 
 GKSU = ["/usr/bin/gksu"]
-SYNPATIC_DESKTOP = ["--desktop", 
-                    "/usr/share/applications/synaptic.desktop", 
+SYNAPTIC_DESKTOP = ["--desktop",
+                    "/usr/share/applications/synaptic.desktop",
                     "--"]
 HAVE_APTDAEMON = False
 try:
@@ -18,6 +18,7 @@
 except ImportError:
     pass
 
+
 # show updates
 def show_updates():
     """ show updates using update-manager """
@@ -38,9 +39,10 @@
     dia.run()
     Gtk.main()
     return trans.exit == enums.EXIT_SUCCESS
-    
+
+
 def _install_all_updates_gksu():
-    cmd = GKSU + SYNPATIC_DESKTOP + [ "/usr/sbin/synaptic ",
+    cmd = GKSU + SYNAPTIC_DESKTOP + ["/usr/sbin/synaptic ",
                                       "--dist-upgrade-mode",
                                       "--non-interactive",
                                       "--hide-main-window",
@@ -48,6 +50,7 @@
                                       ]
     return subprocess.call(cmd)
 
+
 def install_all_updates():
     """ install all updates either with synaptic or aptdaemon """
     if HAVE_APTDAEMON:
@@ -69,14 +72,16 @@
     Gtk.main()
     return trans.exit == enums.EXIT_SUCCESS
 
+
 def _check_updates_gtk():
-    cmd = GKSU + SYNPATIC_DESKTOP + ["/usr/sbin/synaptic",
+    cmd = GKSU + SYNAPTIC_DESKTOP + ["/usr/sbin/synaptic",
                                      "--update-at-startup",
                                      "--non-interactive",
                                      "--hide-main-window",
                                      ]
     subprocess.call(cmd)
 
+
 def check_updates():
     """ check for updates either with aptdaemon or synaptic """
     if HAVE_APTDAEMON:
@@ -88,7 +93,7 @@
 # start packagemanager
 def start_packagemanager():
     if os.path.exists("/usr/sbin/synaptic"):
-        cmd = GKSU + SYNPATIC_DESKTOP + ["/usr/sbin/synaptic"]
+        cmd = GKSU + SYNAPTIC_DESKTOP + ["/usr/sbin/synaptic"]
         return subprocess.call(cmd)
     elif os.path.exists("/usr/bin/software-center"):
         return subprocess.call(["/usr/bin/software-center"])
@@ -111,18 +116,17 @@
     if os.path.exists("/usr/bin/software-center"):
         subprocess.call(["/usr/bin/software-center"])
 
+
 def _add_cdrom_synaptic(mount_path):
-    cmd = GKSU + SYNPATIC_DESKTOP + ["synaptic", "--add-cdrom", mount_path]
+    cmd = GKSU + SYNAPTIC_DESKTOP + ["synaptic", "--add-cdrom", mount_path]
     return subprocess.call(cmd)
 
+
 def add_cdrom(mount_path):
     if os.path.exists("/usr/sbin/synaptic"):
         _add_cdrom_synaptic(mount_path)
     else:
         _add_cdrom_sp(mount_path)
-        
-
-
 
 
 if __name__ == "__main__":
@@ -149,7 +153,7 @@
     command = subparser.add_parser("add_cdrom")
     command.add_argument("mount_path")
     command.set_defaults(command="add_cdrom")
-    
+
     args = parser.parse_args()
     if args.debug:
         logging.basicConfig(level=logging.DEBUG)
@@ -159,10 +163,9 @@
     func_name = args.command
     f_kwargs = {}
     f = globals()[func_name]
-    if args.command  == "add_cdrom":
+    if args.command == "add_cdrom":
         f_kwargs["mount_path"] = args.mount_path
     res = f(**f_kwargs)
 
     if not res:
         sys.exit(1)
-

=== modified file 'data/hooks.py'
--- data/hooks.py	2010-08-23 08:58:54 +0000
+++ data/hooks.py	2012-06-14 22:18:20 +0000
@@ -1,19 +1,26 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python3
+
+from __future__ import print_function
 
 from optparse import OptionParser
-import user, string, dircache, sys, os.path
-
-    
+
+import dircache
+import os.path
+import string
+import sys
+import user
+
+
 class HookFiles(object):
     """ represents all hook files """
 
     # the hooks are stored here
     hookDir = "/var/lib/update-notifier/user.d/"
-    
+
     class HookFile(object):
         """ represents a single hook file """
-        __slots__ = [ "filename", "mtime", "cmd_run", "seen" ]
-        
+        __slots__ = ["filename", "mtime", "cmd_run", "seen"]
+
         def __init__(self, filename):
             self.filename = filename
             self.mtime = os.stat(HookFiles.hookDir+filename).st_mtime
@@ -24,17 +31,16 @@
             """ show the summary for the notification """
             # FIXME: read rfc822 style file and get the i18n version of
             # "Name"
-	    pass
+            pass
         summary = property(summary)
 
         def description(self):
             """ show a long description for the notification """
             # FIXME: read rfc822 style file and get the i18n version of
             # "Description", convert "\n" -> " " and strstrip it afterwards
-	    pass
+            pass
         description = property(description)
 
-
     def __init__(self):
         self._hooks = {}
         self._readSeenFile()
@@ -49,25 +55,25 @@
         if os.path.exists(hooks_seen):
             for line in open(hooks_seen):
                 filename, mtime, cmd_run = string.split(line)
-                if os.path.exists(self.hookDir+filename) and \
-                   not self._hooks.has_key(filename):
+                if os.path.exists(self.hookDir + filename) and \
+                        not filename in self._hooks:
                     h = self.HookFile(filename)
                     h.mtime = mtime
                     h.cmd_run = cmd_run
                     h.seen = True
                     # check if file was motified since we last saw it
-                    if os.stat(self.hookDir+filename).st_mtime > int(mtime):
+                    if os.stat(self.hookDir + filename).st_mtime > int(mtime):
                         h.seen = False
                     self._hooks[filename] = h
 
     def _update(self):
         """ update hook dict with the current state on the fs """
         for hook in dircache.listdir(self.hookDir):
-            if self._hooks.has_key(hook):
+            if hook in self._hooks:
                 # we have it already, check if it was motified since
                 # we last saw it
                 h = self._hooks[hook]
-                if os.stat(self.hookDir+hook).st_mtime > int(h.mtime):
+                if os.stat(self.hookDir + hook).st_mtime > int(h.mtime):
                         h.seen = False
             else:
                 self._hooks[hook] = self.HookFile(hook)
@@ -80,19 +86,20 @@
             if not self._hooks[hook].seen:
                 new.append(self._hooks[hook])
         return new
-    
+
 
 def check():
     hooks = HookFiles()
     new = hooks.checkNew()
     return len(new)
 
+
 def test():
     hooks = HookFiles()
     new = hooks.checkNew()
-    print "Hooks: %s" % len(new)
+    print("Hooks: %s" % len(new))
     for hook in hooks._hooks:
-        print hooks._hooks[hook].notification
+        print(hooks._hooks[hook].notification)
 
 
 if __name__ == "__main__":
@@ -105,7 +112,6 @@
                       default=False, help="run test")
     (options, args) = parser.parse_args()
 
-
     if options.check:
         sys.exit(check())
     elif options.run:

=== modified file 'data/package-data-downloader'
--- data/package-data-downloader	2012-06-13 22:49:33 +0000
+++ data/package-data-downloader	2012-06-14 22:18:20 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 """Process new requests to download per-package data"""
 # Copyright (C) 2012 Canonical Ltd
@@ -16,13 +16,15 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import print_function
+
 import glob
 import os
 import sys
 import subprocess
 import re
 import traceback
-import urllib
+import urllib.request
 import debian.deb822
 import string
 import apt
@@ -184,7 +186,7 @@
                 pass
 
         if proxies:
-            urllib._urlopener = urllib.FancyURLopener(proxies)
+            urllib.request._urlopener = urllib.request.FancyURLopener(proxies)
     except Exception:
         pass
 
@@ -209,13 +211,13 @@
         files = []
         sums = []
         for para in hook.iter_paragraphs(open(file)):
-            if para.has_key('script'):
+            if 'script' in para:
                 if not files:
                     record_failure(relfile)
                     break
                 command = [para['script']]
 
-                if para.has_key('should-download'):
+                if 'should-download' in para:
                     db = debconf.DebconfCommunicator('update-notifier')
                     try:
                         should = db.get(para['should-download'])
@@ -230,8 +232,8 @@
                 # Download each file and verify the sum
                 try:
                     for i in range(len(files)):
-                        print "%s: downloading %s" % (relfile, files[i])
-                        dest_file = urllib.urlretrieve(files[i])[0]
+                        print("%s: downloading %s" % (relfile, files[i]))
+                        dest_file = urllib.request.urlretrieve(files[i])[0]
                         output = subprocess.check_output(["sha256sum", dest_file])
                         output = output.split(' ')[0]
                         if output == sums[i]:

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-12 09:12:28 +0000
+++ debian/changelog	2012-06-14 22:18:20 +0000
@@ -1,3 +1,12 @@
+update-notifier (0.119ubuntu14) UNRELEASED; urgency=low
+
+  * Port to Python 3 
+    - Use the new python-apt API since the legacy API is not available
+      in Python 3.
+    - Various and pyflakes, whitespace, style, line length fixes.
+
+ -- Brian Murray <[e-mail]>  Tue, 12 Jun 2012 08:35:48 -0700
+
 update-notifier (0.119ubuntu13) quantal; urgency=low
 
   * data/apt_check.py:

=== modified file 'debian/control'
--- debian/control	2012-05-14 22:31:36 +0000
+++ debian/control	2012-06-14 22:18:20 +0000
@@ -12,25 +12,27 @@
                libx11-dev,
                autotools-dev,
                libappindicator3-dev,
-               po-debconf
+               po-debconf,
+               python3
 Standards-Version: 3.8.4
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/update-notifier/ubuntu
+X-Python3-Version: >= 3.2
 
 Package: update-notifier
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          update-notifier-common (= ${source:Version}),
-         python,
-         python-dbus,
+         python3,
+         python3-dbus,
          update-manager-gnome | update-manager,
          notification-daemon,
          gksu
 Recommends: apport-gtk, 
-            python-aptdaemon.gtk3widgets | synaptic, 
+            python3-aptdaemon.gtk3widgets | synaptic, 
             software-properties-gtk, 
             anacron, 
-            aptdaemon
+            python3-aptdaemon
 Suggests: ubuntu-system-service
 Description: Daemon which notifies about package updates
  Puts an icon in the user's notification area when package updates are
@@ -42,8 +44,8 @@
 Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         python,
-         python-apt (>= 0.6.12), python-debian, debconf
+         python3,
+         python3-apt (>= 0.6.12), python3-debian, debconf
 Recommends: libpam-modules (>= 1.0.1-9ubuntu3)
 Suggests: gksu
 Description: Files shared between update-notifier and other packages

=== modified file 'debian/rules'
--- debian/rules	2010-06-01 13:28:36 +0000
+++ debian/rules	2012-06-14 22:18:20 +0000
@@ -3,4 +3,4 @@
 export LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 %:
-	dh $@
+	dh $@ --with python3

=== modified file 'tests/test_package-data-downloader.py'
--- tests/test_package-data-downloader.py	2012-03-23 09:11:45 +0000
+++ tests/test_package-data-downloader.py	2012-06-14 22:18:20 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import os
 import shutil