Merge lp:~takluyver/unattended-upgrades/py3 into lp:~ubuntu-core-dev/unattended-upgrades/ubuntu

[Thomas Kluyver]

As part of Ubuntu's push for Python 3 in Quantal (https://blueprints.launchpad.net/ubuntu/+spec/foundations-q-python-versions), this makes unattended-upgrades use Python 3.

The tests pass, and I've checked that it contains equivalent files to the current package (http://packages.ubuntu.com/quantal/all/unattended-upgrades/filelist). I'm not sure how to test unattended-upgrades-shutdown, but I've ensured that the syntax is valid, and inspecting the file, it doesn't look like it will require any other changes for Python 3.

[Thomas Kluyver (takluyver)]

I've just noticed that test_in_chroot.py isn't run with the other tests. It appears to fail on Python 2. How much attention should I pay to it?

[lp:~takluyver/unattended-upgrades/py3]

278. By Michael Vogt on 2012-06-18

* po/da.po:
  - updated, thanks to Joe Dalton, closes: #677804

279. By Michael Vogt on 2012-06-19

* debian/unattended-upgrades.init:
  - use new style lsb-init output, closes: #678030

280. By Michael Vogt on 2012-06-19

honor verbose

[Barry Warsaw (barry)]

Looks like there are some text conflicts as well, but I can try to fix those.

[Barry Warsaw (barry)]

Oh also, the conversion to bytes in send_summary_mail() isn't right. It's generally accepted wisdom that in Python 3, Popen() should be passed universal_newlines=True which gives you unicodes. I think that's the right thing to do in this case.

[Barry Warsaw (barry)]

Thomas, thanks for taking this work on! I appreciate everything you can do to
help us in our porting efforts. A few comments, and then I'll work on merging
this for you.

 - I don't know how to test unattended-upgrades-shutdown, but I'll see if I
   can come up with something.

 - How hard would it be to fix the failing Python 2 test? If it fails in Py2
   it would be nice to fix, but I don't think it should necessarily block your
   work.

 - Note that unless you're holding out the possibility to revert to Python 2,
   or if you're being annoyed by pyflakes warnings, you really don't need to
   future import print_function for Python 3.

 - Line 433 would probably be better rewritten:

    with open(prefix + conf_file, 'rb') as fp:
        current_md5 = fp.read()

   I can fix that for you when I merge your branch.

Other than that, the diff looks pretty good.

[Barry Warsaw (barry)]

Also, test_against_real_archive fails for me even in unchanged trunk:

======================================================================
FAIL: test_against_real_archive (__main__.TestAgainstRealArchive)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "./test_against_real_archive.py", line 47, in test_against_real_archive
    self.assertFalse(" ERROR " in log)
AssertionError: True is not false

----------------------------------------------------------------------
Ran 1 test in 9.248s

[lp:~takluyver/unattended-upgrades/py3]

281. By Barry Warsaw on 2012-06-19

Merge Thomas's branch: Port to Python 3
- Additional fixes by Barry

[Barry Warsaw (barry)]

Thomas, for now I'm going to mark this branch as needs fixing. Please look at my branch, which merges yours into trunk and contains additional fixes that will be necessary. If you can get the remaining tests to pass, I'll be happy to re-review the branch and sponsor it for you.

lp:~barry/unattended-upgrades/py3merge

review: Needs Fixing

[Thomas Kluyver (takluyver)]

Thanks Barry,

On 19 June 2012 20:25, Barry Warsaw <email address hidden> wrote:
>  - How hard would it be to fix the failing Python 2 test?  If it fails in Py2
>   it would be nice to fix, but I don't think it should necessarily block your
>   work.

I should have been clearer about this - I meant 'it fails *even* in
Python 2, so I haven't tried it in Python 3 yet'. To further
complicate matters, it tests in a Lucid chroot, and there's no
python3-apt in Lucid. I don't know whether testing in an old version
is an intentional way to make sure there's updates available, or just
because the test was written then and hasn't been changed.

For reference, I've re-run it (in Python 2) and put the last part of
the output at https://gist.github.com/2957247

>  - Note that unless you're holding out the possibility to revert to Python 2,
>   or if you're being annoyed by pyflakes warnings, you really don't need to
>   future import print_function for Python 3.

Do any other distributions use unattended-upgrades? If anyone wants to
keep running it in Python 2, it's very easy for me to enable that. If
not, I agree that it's slightly tidier not to.

>  - Line 433 would probably be better rewritten:
>
>    with open(prefix + conf_file, 'rb') as fp:
>        current_md5 = fp.read()
>
>   I can fix that for you when I merge your branch.

I see you did fix it; thanks.

Thomas

[Thomas Kluyver (takluyver)]

Thanks for the tip about Popen(), I didn't know about that argument. It seems rather unintuitive to have universal_newlines control text/bytes mode, though.

I've checked out your branch - I don't see the failure in test_against_real_archive.py, either on Python 3 or 2. Full output is at https://gist.github.com/2957277

[Barry Warsaw (barry)]

On Jun 20, 2012, at 12:15 AM, Thomas Kluyver wrote:

>I've checked out your branch - I don't see the failure in
>test_against_real_archive.py, either on Python 3 or 2. Full output is at
>https://gist.github.com/2957277

That probably means it's dependent on the environment. Something in my
environment (on precise and quantal, on both a normal desktop and chroot) is
causing the test to fail. That plus the fact that the test hits the network
tell me that it's not a very good test.

The problem is, if I want to sponsor this for you, I have to build the source
package. To do that, I'd have to disable the test since the source package
won't build with a failing test. Maybe that's the best we can do with such a
bad test.

It's not clear to me what this test is actually trying to do though. Do you
think you could take a crack at improving the test so that it isn't dependent
on the environment, and/or that it doesn't hit the network? Failing that, we
might just have to bite the bullet and disable the test.

As for continuing to support Python 2, perhaps the only reason to do so is if
it needs to be backported to earlier versions that don't have Python 3. If
not, then I personally think it would be fine to drop it.

[lp:~takluyver/unattended-upgrades/py3]

282. By Thomas Kluyver on 2012-06-24

Fix subprocess communication on Python 3

283. By Thomas Kluyver on 2012-06-24

Disable test that requires network access

284. By Thomas Kluyver on 2012-06-24

Remove Python 2 compatible imports

[Thomas Kluyver (takluyver)]

I think the nature of that test needs network communications - 'against real archive' seems to mean the Ubuntu package archive. I've disabled it so that "cd test/; make" doesn't see it (it checks the executable flag on the files). The package building doesn't appear to run any tests, however.

I've also dropped the backwards compatible imports, so it will only work with Python 3.

[Barry Warsaw (barry)]

On Jun 24, 2012, at 03:46 PM, Thomas Kluyver wrote:

>I think the nature of that test needs network communications - 'against real
>archive' seems to mean the Ubuntu package archive. I've disabled it so that
>"cd test/; make" doesn't see it (it checks the executable flag on the
>files). The package building doesn't appear to run any tests, however.
>
>I've also dropped the backwards compatible imports, so it will only work with
>Python 3.

Quick response: I'm now getting a text conflict against trunk in
debian/unattended-upgrades.init. Can you please resolve that?

I was able to build the package locally and everything else looks fine, so
once you push an non-conflicting update, I'll try to sponsor this for you.

Thanks for your work on porting this to Python 3!

[lp:~takluyver/unattended-upgrades/py3]

285. By Thomas Kluyver on 2012-06-25

Merge trunk

[Thomas Kluyver (takluyver)]

Thanks, Barry. I've merged in trunk and resolved the conflict.

[Barry Warsaw (barry)]

Thanks Thomas, looks great. I've pushed the merge to trunk, but it's up to Michael to upload the new package. I think it has to go to Debian first, and then it'll get sync'd into Quantal.

[Barry Warsaw (barry)]

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2012-06-25 20:04:38 +0000
@@ -0,0 +1,2 @@
+__pycache__
+build

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-25 07:11:57 +0000
+++ debian/changelog	2012-06-25 20:04:38 +0000
@@ -16,6 +16,9 @@
   * debian/unattended-upgrades.init:
     - fixes new style lsb-init output, closes: #678030
 
+  [ Thomas Kluyver ]
+  * Port to Python 3
+
  -- Michael Vogt <[e-mail]>  Mon, 25 Jun 2012 08:42:23 +0200
 
 unattended-upgrades (0.78) unstable; urgency=low
@@ -28,7 +31,7 @@
     - updated, thanks to Joe Dalton, closes: #677804
   * po/de.po:
     - updated, thanks to Chris Leick (closes: #678204)
-  
+
   [ Teodor MICU ]
   * debian/unattended-upgrades.init:
     - use new style lsb-init output, closes: #678030

=== modified file 'debian/control'
--- debian/control	2012-06-19 15:26:37 +0000
+++ debian/control	2012-06-25 20:04:38 +0000
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Michael Vogt <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~), po-debconf, lsb-release
-Build-Depends-Indep: python (>= 2.6.6-3~), python-distutils-extra
-Standards-Version: 3.8.3
+Build-Depends-Indep: python3, python3-distutils-extra
+Standards-Version: 3.9.3
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/unattended-upgrades/ubuntu/
 
 Package: unattended-upgrades
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, python, 
- python-apt (>= 0.7.90), apt-utils, apt, ucf, lsb-release, 
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, python3, 
+ python3-apt (>= 0.7.90), apt-utils, apt, ucf, lsb-release,
  lsb-base (>= 3.2-14)
 Suggests: bsd-mailx
 Description: automatic installation of security upgrades

=== modified file 'debian/rules'
--- debian/rules	2011-11-09 19:20:50 +0000
+++ debian/rules	2012-06-25 20:04:38 +0000
@@ -3,24 +3,26 @@
 DIST=$(shell /usr/bin/lsb_release -i -s)
 
 %:
-	dh $@ --with python2
+	dh $@ --with python3
 
 override_dh_auto_build:
 	# copy the right template into place
 	cp data/50unattended-upgrades.$(DIST) data/50unattended-upgrades
-	dh_auto_build
+	python3 setup.py build
+
+override_dh_auto_install:
+	python3 setup.py install \
+		--root=$(CURDIR)/debian/unattended-upgrades \
+		--install-layout=deb
 
 override_dh_auto_clean:
 	# Sanity-check before upload.
-	set -e; if [ -e /usr/lib/python$(PYVER)/py_compile.py ]; then \
-		for f in unattended-upgrade unattended-upgrade-shutdown; do \
-			ln -nsf $$f $$f.py; \
-			python$(PYVER) /usr/lib/python$(PYVER)/py_compile.py \
-				$$f.py; \
-			rm -f $$f.py; \
-		done; \
-	fi
-	dh_auto_clean
+	set -e; for f in unattended-upgrade unattended-upgrade-shutdown; do \
+		ln -nsf $$f $$f.py; \
+		py3compile $$f.py; \
+		rm -f $$f.py; \
+	done
+	python3 setup.py clean -a
 
 override_dh_installinit:
 	# we do not want to run the init script in the postinst/prerm, its

=== modified file 'debian/unattended-upgrades.init'
--- debian/unattended-upgrades.init	2012-06-25 07:07:39 +0000
+++ debian/unattended-upgrades.init	2012-06-25 20:04:38 +0000
@@ -33,7 +33,7 @@
 stop)
 	if [ -e $SHUTDOWN_HELPER ]; then
 		[ "$VERBOSE" != "no" ] && log_action_begin_msg "Checking for running $DESC"
-		python $SHUTDOWN_HELPER
+		python3 $SHUTDOWN_HELPER
 		[ "$VERBOSE" != "no" ] && log_action_end_msg $? "$NAME"
 	fi
 	;;

=== modified file 'pm/sleep.d/10_unattended-upgrades-hibernate'
--- pm/sleep.d/10_unattended-upgrades-hibernate	2011-11-08 16:56:58 +0000
+++ pm/sleep.d/10_unattended-upgrades-hibernate	2012-06-25 20:04:38 +0000
@@ -17,7 +17,7 @@
 case "${1}" in
         hibernate)
                 if [ -e $SHUTDOWN_HELPER ]; then
-         	    python $SHUTDOWN_HELPER
+         	    python3 $SHUTDOWN_HELPER
                 fi
                 ;;
         resume|thaw)

=== modified file 'test/Makefile'
--- test/Makefile	2011-10-07 09:22:19 +0000
+++ test/Makefile	2012-06-25 20:04:38 +0000
@@ -6,9 +6,9 @@
 	set -e; \
 	find . -name 'test_*.py' | \
 	while read file; do \
-	    echo "Running $$file"; \
 	    if [ -x $$file ]; then \
-	    	python $$file ; \
+		echo "Running $$file"; \
+	    	python3 $$file ; \
 	    fi \
 	done
 

=== modified file 'test/create_debug_lock.py'
--- test/create_debug_lock.py	2011-06-16 07:10:07 +0000
+++ test/create_debug_lock.py	2012-06-25 20:04:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # create a lock file so that unattended-upgrades-shutdown pauses
 # on shutdown -- useful for testing

=== modified file 'test/test_against_real_archive.py' (properties changed: +x to -x)
--- test/test_against_real_archive.py	2012-02-28 10:48:18 +0000
+++ test/test_against_real_archive.py	2012-06-25 20:04:38 +0000
@@ -1,4 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+"""Test unattended_upgrades against the real archive in a chroot.
+
+Note that this test is not run by the makefile in this folder, as it requires
+network access, and it fails in some situations (unclear which).
+"""
 
 import apt
 import apt_pkg
@@ -42,9 +47,10 @@
         res = unattended_upgrade.main(options, os.path.abspath("./aptroot"))
         # check if the log file exists
         self.assertTrue(os.path.exists(logfile))
-        log = open(logfile).read()
+        with open(logfile) as fp:
+            log = fp.read()
         # check that stuff worked
-        self.assertFalse(" ERROR " in log)
+        self.assertFalse(" ERROR " in log, log)
         # check if we actually have the expected ugprade in it
         self.assertTrue(
             re.search("INFO Packages that are upgraded:.*awstats", log))

=== modified file 'test/test_conffile.py'
--- test/test_conffile.py	2011-04-28 16:29:19 +0000
+++ test/test_conffile.py	2012-06-25 20:04:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import apt_pkg
 import logging

=== modified file 'test/test_in_chroot.py'
--- test/test_in_chroot.py	2012-01-02 13:14:02 +0000
+++ test/test_in_chroot.py	2012-06-25 20:04:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import apt
 import logging
@@ -56,7 +56,7 @@
 class TestUnattendedUpgrade(unittest.TestCase):
 
     def _create_new_debootstrap_tarball(self, tarball, target):
-        print "creating initial test tarball, this is needed only once"
+        print("creating initial test tarball, this is needed only once")
         # force i386
         subprocess.call(["debootstrap",
                          "--arch=%s" % ARCH,
@@ -73,7 +73,7 @@
         subprocess.call(["tar", "xzf", tarball])
 
     def test_normal_upgrade(self):
-        print "Running normal unattended upgrade in chroot"
+        print("Running normal unattended upgrade in chroot")
         options = MockOptions()
         options.minimal_upgrade_steps = False
         # run it
@@ -82,7 +82,7 @@
         self.assertTrue(self._verify_install_log_in_real_chroot(target))
 
     def test_minimal_steps_upgrade(self):
-        print "Running minimal steps unattended upgrade in chroot"
+        print("Running minimal steps unattended upgrade in chroot")
         options = MockOptions()
         options.minimal_upgrade_steps = True
         # run it
@@ -91,7 +91,7 @@
         self.assertTrue(self._verify_install_log_in_real_chroot(target))
 
     def test_upgrade_on_shutdown_upgrade(self):
-        print "Running unattended upgrade on shutdown (download and install) in chroot"
+        print("Running unattended upgrade on shutdown (download and install) in chroot")
         # ensure that it actually installs in shutdown env mode
         options = MockOptions()
         os.environ["UNATTENDED_UPGRADES_FORCE_INSTALL_ON_SHUTDOWN"] = "1"
@@ -121,7 +121,7 @@
             and does some basic verifications
         """
         if os.getuid() != 0:
-            print "Skipping because uid != 0"
+            print("Skipping because uid != 0")
             return
 
         # clear to avoid pollution in the chroot
@@ -171,7 +171,7 @@
                 if pid == apid:
                     ret = os.WEXITSTATUS(status)
                     break
-        #print "*******************", all_progress
+        #print("*******************", all_progress)
         self.assertEqual(ret, 0)
         # this number is a bit random, we just want to be sure we have 
         # progress data
@@ -183,7 +183,7 @@
         # examine log
         log = self._get_lockfile_location(target)
         logfile = open(log).read()
-        #print logfile
+        #print(logfile)
         NEEDLE_PKG="ca-certificates"
         if not re.search(
             "Packages that are upgraded:.*%s" % NEEDLE_PKG, logfile):
@@ -198,7 +198,7 @@
         if not "Preparing to replace %s" % NEEDLE_PKG in dpkg_logfile:
             logging.warn("Did not find %s upgrade in the dpkg.log" % NEEDLE_PKG)
             return False
-        #print dpkg_logfile
+        #print(dpkg_logfile)
         return True
 
 

=== modified file 'test/test_logdir.py'
--- test/test_logdir.py	2011-03-04 15:04:54 +0000
+++ test/test_logdir.py	2012-06-25 20:04:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import apt_pkg
 import logging

=== modified file 'test/test_mail.py'
--- test/test_mail.py	2011-02-03 19:50:16 +0000
+++ test/test_mail.py	2012-06-25 20:04:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import apt
 import apt_pkg
@@ -7,7 +7,7 @@
 import unittest
 import sys
 
-from StringIO import StringIO
+from io import StringIO
 
 import unattended_upgrade
 import unattended_upgrade
@@ -36,7 +36,8 @@
         pkgs_kept_back = []
         mem_log = StringIO("mem_log text")
         logfile_dpkg = "./apt-term.log"
-        open("./apt-term.log", "w").write("logfile_dpkg text")
+        with open("./apt-term.log", "w") as fp:
+            fp.write("logfile_dpkg text")
         return (pkgs, res, pkgs_kept_back, mem_log, logfile_dpkg)
 
     def _verify_common_mail_content(self, mail_txt):
@@ -45,16 +46,19 @@
         self.assertTrue("Packages that are upgraded:\n 2vcard" in mail_txt)
 
     def test_summary_mail_reboot(self):
-        open("./reboot-required","w").write("")
+        with open("./reboot-required","w") as fp:
+            fp.write("")
         send_summary_mail(*self._return_mock_data())
         os.unlink("./reboot-required")
-        mail_txt = open("mail.txt").read()
+        with open("mail.txt") as fp:
+            mail_txt = fp.read()
         self.assertTrue("[reboot required]" in mail_txt)
         self._verify_common_mail_content(mail_txt)
         
     def test_summary_mail_no_reboot(self):
         send_summary_mail(*self._return_mock_data())
-        mail_txt = open("mail.txt").read()
+        with open("mail.txt") as fp:
+            mail_txt = fp.read()
         self.assertFalse("[reboot required]" in mail_txt)
         self._verify_common_mail_content(mail_txt)
     
@@ -63,18 +67,21 @@
         # for both success and failure
         apt_pkg.config.set("Unattended-Upgrade::MailOnlyOnError", "false")
         send_summary_mail(*self._return_mock_data(successful=True))
-        self._verify_common_mail_content(open("mail.txt").read())
+        with open("mail.txt") as fp:
+            self._verify_common_mail_content(fp.read())
         os.remove("mail.txt")
         # now with a simulated failure
         send_summary_mail(*self._return_mock_data(successful=False))
-        self._verify_common_mail_content(open("mail.txt").read())
+        with open("mail.txt") as fp:
+            self._verify_common_mail_content(fp.read())
         os.remove("mail.txt")
         # now test with "MailOnlyOnError"
         apt_pkg.config.set("Unattended-Upgrade::MailOnlyOnError", "true")
         send_summary_mail(*self._return_mock_data(successful=True))
         self.assertFalse(os.path.exists("mail.txt"))
         send_summary_mail(*self._return_mock_data(successful=False))
-        mail_txt = open("mail.txt").read()
+        with open("mail.txt") as fp:
+            mail_txt = fp.read()
         self._verify_common_mail_content(mail_txt)
         self.assertTrue("Unattended upgrade returned: False" in mail_txt)
         self.assertTrue(os.path.exists("mail.txt"))

=== modified file 'test/test_minimal_partitions.py'
--- test/test_minimal_partitions.py	2011-11-18 10:46:15 +0000
+++ test/test_minimal_partitions.py	2012-06-25 20:04:38 +0000
@@ -1,12 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import apt
 import apt_pkg
 import os
-import logging
 import unittest
-import sys
-import time
 
 import unattended_upgrade
 
@@ -18,7 +15,7 @@
     
     # overwrite to log the data
     def status_change(self, pkg, percent, status):
-        print pkg, percent
+        print(pkg, percent)
         self.DATA.append([pkg, percent])
 
 class TestMinimalPartitions(unittest.TestCase):

=== modified file 'test/test_origin_pattern.py'
--- test/test_origin_pattern.py	2011-11-22 12:54:47 +0000
+++ test/test_origin_pattern.py	2012-06-25 20:04:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import apt
 import apt_pkg

=== modified file 'test/test_substitute.py'
--- test/test_substitute.py	2011-02-04 11:05:12 +0000
+++ test/test_substitute.py	2012-06-25 20:04:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import apt
 import apt_pkg
@@ -7,7 +7,7 @@
 import unittest
 import sys
 
-from StringIO import StringIO
+from io import StringIO
 
 import unattended_upgrade
 from unattended_upgrade import substitute, get_allowed_origins

=== modified file 'unattended-upgrade'
--- unattended-upgrade	2012-05-31 07:51:04 +0000
+++ unattended-upgrade	2012-06-25 20:04:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright (c) 2005-2012 Canonical Ltd
 #
 # AUTHOR:
@@ -20,11 +20,10 @@
 # along with unattended-upgrades; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-
 import apt_inst
 import apt_pkg
 
-import ConfigParser
+import configparser
 import copy
 import datetime
 import fcntl
@@ -33,7 +32,7 @@
 import string
 import sys
 
-from StringIO import StringIO
+from io import StringIO
 from optparse import OptionParser
 from subprocess import Popen, PIPE
 
@@ -112,9 +111,8 @@
     LOG = PROGRESS_LOG 
 
     def status_change(self, pkg, percent, status):
-        f=open(self.LOG, "w")
-        f.write(_("Progress: %s %% (%s)") % (percent, pkg))
-        f.close()
+        with open(self.LOG, "w") as f:
+            f.write(_("Progress: %s %% (%s)") % (percent, pkg))
 
     def _fixup_fds(self):
         required_fds = [ 0, 1, 2, # stdin, stdout, stderr
@@ -135,19 +133,19 @@
                 try:
                     fd = int(fdname)
                 except Exception as e:
-                    print "ERROR: can not get fd for '%s'" % fdname
+                    print("ERROR: can not get fd for '%s'" % fdname)
                 if fd in required_fds:
                     continue
                 try:
                     os.close(fd)
-                    #print "closed: ", fd
+                    #print("closed: ", fd)
                 except OSError as e:
                     # there will be one fd that can not be closed
                     # as its the fd from pythons internal diropen()
                     # so its ok to ignore one close error
                     error_count += 1
                     if error_count > 1:
-                        print "ERROR: os.close(%s): %s" % (fd, e)
+                        print("ERROR: os.close(%s): %s" % (fd, e))
 
     def fork(self):
         pid = os.fork()
@@ -270,7 +268,7 @@
     try:
         with Unlocked():
             res = cache.commit(install_progress=iprogress)
-    except SystemError,e:
+    except SystemError as e:
         error = e
     if res:
         logging.info(_("All upgrades installed"))
@@ -334,7 +332,7 @@
                 if not res:
                     raise Exception("cache.commit() returned false")
             cache.open()
-        except Exception, e:
+        except Exception as e:
             logging.error(_("Installing the upgrades failed!"))
             logging.error(_("error message: '%s'") % e)
             logging.error(_("dpkg returned a error! See '%s' for details") % \
@@ -390,7 +388,7 @@
         control = apt_inst.DebFile(debfile).control.extractdata("control")
         sections = apt_pkg.TagSection(control)
         return sections["Package"]
-    except (IOError, SystemError), e:
+    except (IOError, SystemError) as e:
         logging.error("failed to read deb file '%s' (%s)" % (debfile, e))
         # dumb fallback
         return debfile.split("_")[0]
@@ -408,9 +406,9 @@
                 conffiles = section.get("Conffiles")
                 # Conffiles:
                 # /etc/bash_completion.d/m-a c7780fab6b14d75ca54e11e992a6c11c
-                for line in string.split(conffiles,"\n"):
+                for line in conffiles.splitlines():
                     logging.debug("conffile line: %s", line)
-                    l = string.split(string.strip(line))
+                    l = line.strip().split()
                     conf_file = l[0]
                     md5 = l[1]
                     if len(l) > 2:
@@ -428,7 +426,7 @@
                     # does not have conffiles anymore
                     deb = apt_inst.DebFile(destFile)
                     try:
-                        pkg_conffiles = deb.control.extractdata("conffiles")
+                        pkg_conffiles = deb.control.extractdata("conffiles").decode('utf-8')
                     except LookupError as e:
                         logging.debug("No conffiles in %s anymore? (%s)" % (destFile, e))
                         pkg_conffiles = ""
@@ -437,7 +435,8 @@
                         logging.debug("'%s' not in package conffiles '%s'" % (conf_file, pkg_conffiles))
                         continue
                     # test against the installed file
-                    current_md5 = apt_pkg.md5sum(open(prefix+conf_file).read())
+                    with open(prefix+conf_file, 'rb') as fp:
+                        current_md5 = apt_pkg.md5sum(fp.read())
                     logging.debug("current md5: %s" % current_md5)
                     # hashes are the same, no conffile prompt
                     if current_md5 == md5:
@@ -446,9 +445,12 @@
                     dpkg_cmd = ["dpkg-deb","--fsys-tarfile",destFile]
                     tar_cmd = ["tar","-x","-O", "-f","-", "."+conf_file]
                     md5_cmd = ["md5sum"]
-                    dpkg_p = Popen(dpkg_cmd, stdout=PIPE)
-                    tar_p = Popen(tar_cmd, stdin=dpkg_p.stdout, stdout=PIPE)
-                    md5_p = Popen(md5_cmd, stdin=tar_p.stdout, stdout=PIPE)
+                    dpkg_p = Popen(dpkg_cmd, stdout=PIPE,
+                                   universal_newlines=True)
+                    tar_p = Popen(tar_cmd, stdin=dpkg_p.stdout, stdout=PIPE,
+                                  universal_newlines=True)
+                    md5_p = Popen(md5_cmd, stdin=tar_p.stdout, stdout=PIPE,
+                                  universal_newlines=True)
                     pkg_md5sum = md5_p.communicate()[0].split()[0]
                     logging.debug("pkg_md5sum: %s" % pkg_md5sum)
                     # the md5sum in the deb is unchanged, this will not 
@@ -496,7 +498,7 @@
     """ deal with apt-listchanges """
     if os.path.exists(conf):
         # check if mail is used by apt-listchanges
-        cf = ConfigParser.ConfigParser()
+        cf = configparser.ConfigParser()
         cf.read(conf)
         if cf.has_section("apt") and cf.has_option("apt", "frontend"):
             frontend = cf.get("apt","frontend")
@@ -520,15 +522,16 @@
     # mails on on errors, just exit here
     if (res and
         apt_pkg.config.find_b("Unattended-Upgrade::MailOnlyOnError", False)):
-	return
+        return
     # Check if reboot-required flag is present
     logging.debug("Sending mail with '%s' to '%s'" % (logfile_dpkg, email))
     if os.path.isfile(REBOOT_REQUIRED_FILE):
         subject = _("[reboot required] unattended-upgrades result for '%s'") % host()
     else:
         subject = _("unattended-upgrades result for '%s'") % host()
-    mail = subprocess.Popen([MAIL_BINARY, "-s", subject,
-                             email], stdin=subprocess.PIPE)
+    mail = subprocess.Popen([MAIL_BINARY, "-s", subject, email], 
+                            stdin=subprocess.PIPE,
+                            universal_newlines=True)
     s = _("Unattended upgrade returned: %s\n\n") % res
     if os.path.isfile(REBOOT_REQUIRED_FILE):
         s += _("Warning: A reboot is required to complete this upgrade.\n\n")
@@ -542,7 +545,8 @@
     s += "\n"
     if os.path.exists(logfile_dpkg):
         s += _("Package installation log:")+"\n"
-        s += open(logfile_dpkg).read()
+        with open(logfile_dpkg) as fp:
+            s += fp.read()
         s += "\n\n"
     s += _("Unattended-upgrades log:\n")
     s += mem_log.getvalue()
@@ -569,7 +573,7 @@
         old_stdout = 1
         old_stderr = 2
     else:
-        fd = os.open(logfile_dpkg, os.O_RDWR|os.O_CREAT, 0644)
+        fd = os.open(logfile_dpkg, os.O_RDWR|os.O_CREAT, 0o644)
         old_stdout = os.dup(1)
         old_stderr = os.dup(2)
         os.dup2(fd,1)
@@ -580,7 +584,8 @@
             # COMPAT with the mispelling
             apt_pkg.config.find_b("Unattended-Upgrades::MinimalSteps", False) or
             apt_pkg.config.find_b("Unattended-Upgrade::MinimalSteps", False)):
-            open("/var/run/unattended-upgrades.pid", "w").write("%s" % os.getpid())
+            with open("/var/run/unattended-upgrades.pid", "w") as fp:
+                fp.write("%s" % os.getpid())
             # try upgrade all "pkgs" in minimal steps
             pkg_install_success = upgrade_in_minimal_steps(
                 cache, [pkg.name for pkg in pkgs_to_upgrade], logfile_dpkg)
@@ -677,7 +682,7 @@
         lockfd = apt_pkg.get_lock(os.path.join(admindir, "lock"), False)
         if lockfd > 0:
             logging.warning(_("Unclean dpkg state detected, trying to correct"))
-            print _("Unclean dpkg state detected, trying to correct")
+            print(_("Unclean dpkg state detected, trying to correct"))
             env = copy.copy(os.environ)
             env["DEBIAN_FRONTEND"] = "noninteractive"
             try:
@@ -693,17 +698,17 @@
     # check and get lock
     try:
         apt_pkg.pkgsystem_lock()
-    except SystemError, e:
+    except SystemError as e:
         logging.error(_("Lock could not be acquired (another package "
                         "manager running?)"))
-        print _("Cache lock can not be acquired, exiting")
+        print(_("Cache lock can not be acquired, exiting"))
         sys.exit(1)
 
     # get a cache
     cache = UnattendedUpgradesCache(rootdir=rootdir, 
                                     allowed_origins=allowed_origins)
     if cache._depcache.broken_count > 0:
-        print _("Cache has broken packages, exiting")
+        print(_("Cache has broken packages, exiting"))
         logging.error(_("Cache has broken packages, exiting"))
         sys.exit(1)
     # speed things up with latest apt
@@ -739,7 +744,7 @@
                     logging.debug("sanity check failed")
                     rewind_cache(cache, pkgs_to_upgrade)
                     pkgs_kept_back.append(pkg.name)
-            except SystemError, e:
+            except SystemError as e:
                 # can't upgrade
                 logging.warning(_("package '%s' upgradable but fails to be marked for upgrade (%s)") % (pkg.name, e))
                 rewind_cache(cache, pkgs_to_upgrade)
@@ -761,7 +766,7 @@
     pm = apt_pkg.PackageManager(cache._depcache)
     try:
         pm.get_archives(fetcher,list,recs)
-    except SystemError, e:
+    except SystemError as e:
         logging.error(_("GetArchives() failed: '%s'") % e)
     res = fetcher.run()
 
@@ -771,14 +776,14 @@
         for item in fetcher.items:
             logging.debug("%s" % item)
             if item.status == item.STAT_ERROR:
-                print _("An error ocured: '%s'") % item.error_text
+                print(_("An error ocured: '%s'") % item.error_text)
                 logging.error(_("An error ocured: '%s'") % item.error_text)
             if not item.complete:
-                print _("The URI '%s' failed to download, aborting") % item.desc_uri
+                print(_("The URI '%s' failed to download, aborting") % item.desc_uri)
                 logging.error(_("The URI '%s' failed to download, aborting") % item.desc_uri)
                 sys.exit(1)
             if not os.path.exists(item.destfile):
-                print _("Download finished, but file '%s' not there?!?" % item.destfile)
+                print(_("Download finished, but file '%s' not there?!?" % item.destfile))
                 logging.error("Download finished, but file '%s' not there?!?" % item.destfile)
                 sys.exit(1)
             if not item.is_trusted:
@@ -792,7 +797,7 @@
                 # the cron mail (only if no summary mail is requested)
                 email = apt_pkg.config.find("Unattended-Upgrade::Mail", "")
                 if not email:
-                    print _("Package '%s' has conffile prompt and needs to be upgraded manually") % pkgname_from_deb(item.destfile)
+                    print(_("Package '%s' has conffile prompt and needs to be upgraded manually") % pkgname_from_deb(item.destfile))
                 # log to the logfile
                 logging.warning(_("Package '%s' has conffile prompt and needs to be upgraded manually") % pkgname_from_deb(item.destfile))
                 blacklisted_pkgs.append(pkgname_from_deb(item.destfile))
@@ -907,7 +912,7 @@
     (options, args) = parser.parse_args()
 
     if os.getuid() != 0:
-        print _("You need to be root to run this application")
+        print(_("You need to be root to run this application"))
         sys.exit(1)
 
     # nice & ionce

=== modified file 'unattended-upgrade-shutdown'
--- unattended-upgrade-shutdown	2012-04-26 11:40:46 +0000
+++ unattended-upgrade-shutdown	2012-06-25 20:04:38 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright (c) 2009 Canonical Ltd
 #
 # AUTHOR:
@@ -141,8 +141,8 @@
             os.kill(pid, signal.SIGUSR1)
         # show log
         log_progress()
-	time.sleep(5)
-	if (time.time() - start_time) > options.delay*60:
+        time.sleep(5)
+        if (time.time() - start_time) > options.delay*60:
             logging.warning(_("Giving up on lockfile after %s delay") % options.delay)
             sys.exit(1)