Merge lp:~matttbe/chromium-browser/lp1013171 into lp:~chromium-team/chromium-browser/chromium-browser.quantal

[Matthieu Baerts]

Hello members of the Chromium team,

This is just a patch to update apport hook for python3.
I set you as reviewer because you're the owner of the main branch but I can add ubuntu-sponsors team and propose a debdiff if you want ;)

Have a nice day,

Matt

[Ken VanDine (ken-vandine)]

This was merged into my branch

review: Approve

=== modified file 'debian/apport/chromium-browser.py'
--- debian/apport/chromium-browser.py	2011-05-09 17:41:33 +0000
+++ debian/apport/chromium-browser.py	2012-07-02 14:36:23 +0000
@@ -11,6 +11,7 @@
 the full text of the license.
 '''
 
+from __future__ import print_function
 import os, sys, getopt, codecs
 import time
 from stat import *
@@ -57,7 +58,7 @@
     report['RelatedPackagesPolicy'] = ''
     for pkg in pkgs:
         script = subprocess.Popen(['apt-cache', 'policy', pkg], stdout=subprocess.PIPE)
-        report['RelatedPackagesPolicy'] += script.communicate()[0] + "\n"
+        report['RelatedPackagesPolicy'] += str(script.communicate()[0]) + "\n"
 
 def gconf_values(report, keys):
     report['gconf-keys'] = ''
@@ -67,7 +68,7 @@
         except OSError:
             report['gconf-keys'] = "gconftool-2 not found"
             return
-        out = script.communicate()[0]
+        out = str(script.communicate()[0])
         if out == "":
             out = "**unset**\n"
         report['gconf-keys'] += key + " = " + out
@@ -105,7 +106,7 @@
     # list entensions+versions
     report['ChromiumPrefs'] += "extensions/settings =\n"
     if 'settings' in entry['extensions']:
-        for ext in entry['extensions']['settings'].keys():
+        for ext in list(entry['extensions']['settings'].keys()):
             report['ChromiumPrefs'] += " - '" + ext + "'\n"
             if 'manifest' in entry['extensions']['settings'][ext]:
                 for k in [ 'name', 'description', 'version', 'update_url' ]:
@@ -243,17 +244,17 @@
 
     # Disk usage
     script = subprocess.Popen([ 'df', '-Th' ], stdout=subprocess.PIPE)
-    report['DiskUsage'] = script.communicate()[0] + "\n\nInodes:\n"
+    report['DiskUsage'] = str(script.communicate()[0]) + "\n\nInodes:\n"
     script = subprocess.Popen([ 'df', '-ih' ], stdout=subprocess.PIPE)
-    report['DiskUsage'] += script.communicate()[0]
+    report['DiskUsage'] += str(script.communicate()[0])
 
 ## DEBUGING ##
 if __name__ == '__main__':
     sys.stdout = codecs.getwriter('utf8')(sys.stdout)
     try:
         opts, args = getopt.getopt(sys.argv[1:], "-u:", [ 'user-dir=' ])
-    except getopt.GetoptError, err:
-        print str(err)
+    except getopt.GetoptError as err:
+        print(str(err))
         sys.exit(2)
 
     userdir = None
@@ -266,4 +267,4 @@
     report = {}
     add_info(report, userdir = userdir)
     for key in report:
-        print '[%s]\n%s\n' % (key, report[key])
+        print('[%s]\n%s\n' % (key, report[key]))

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-18 16:37:20 +0000
+++ debian/changelog	2012-07-02 14:36:23 +0000
@@ -1,3 +1,11 @@
+chromium-browser (18.0.1025.168~r134367-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/apport:
+   - Update apport hook for python3 (LP: #1013171)
+      patch made with the help of Edward Donovan
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Mon, 02 Jul 2012 16:21:57 +0200
+
 chromium-browser (18.0.1025.168~r134367-0ubuntu1) quantal; urgency=low
   
   * debian/rules