Merge lp:~brian-murray/ubuntu/natty/apport/linux-staging into lp:~package-import/ubuntu/natty/apport/defunct

[Brian Murray]

There are a lot of kernel bug reports with only [STAGING] as the title. This should fix that. Here is a search showing them:

https://bugs.edge.launchpad.net/ubuntu/+source/linux?field.searchtext=STAGING&orderby=-datecreated&search=Search&field.status%3Alist=NEW&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=FIXCOMMITTED&field.assignee=&field.bug_reporter=&field.omit_dupes=on&field.has_patch=&field.has_no_package=

[Kees Cook (kees)]

Looks good to me, thanks.

review: Approve

[Colin Watson (cjwatson)]

lp:ubuntu/apport currently seems to be outdated and not being used. Can you resubmit this against lp:~ubuntu-core-dev/ubuntu/natty/apport/ubuntu, as per the package's Vcs-Bzr field?

review: Needs Resubmitting

Unmerged revisions

1774. By Brian Murray on 2011-04-20

link to bug number

1773. By Brian Murray on 2011-04-20

Only prepend linux bug titles with [STAGING] if a title exists

1772. By Martin Pitt on 2011-04-20

releasing version 1.20.1-0ubuntu3

1771. By Martin Pitt on 2011-04-20

etc/default/apport: Disable by default for the final release.

1770. By Martin Pitt on 2011-04-20

* Merge from trunk:
  - Use kde-open instead of kfmclient to open URLs under KDE. Thanks Philip
    Muškovac. (LP: #765808)

1769. By Martin Pitt on 2011-04-19

releasing version 1.20.1-0ubuntu2

1768. By Martin Pitt on 2011-04-19

* Merge bug fixes from trunk:
  - apport-gtk: HTML-escape text for dialogs with URLs. (LP: #750870)
  - dump_acpi_tables.py: Check to see if acpi/tables dir is mounted first.
    Thanks Brian Murray. (LP: #729622)
  - man/apport-cli.1: Document recently added -w/--window option. Thanks
    Abhinav Upadhyay. (LP: #765600)

1767. By Martin Pitt on 2011-04-19

The kernel team has decided that asking the user for a bunch of
information which they may not be able to answer is the wrong thing to do.
Therefore, all the propmpting of the user for said information has been
removed. Also removed is the tagging of "needs-upstream-testing".

1766. By Martin Pitt on 2011-03-31

releasing version 1.20.1-0ubuntu1

1765. By Martin Pitt on 2011-03-31

new upstream release 1.20.1

=== modified file 'NEWS'
--- NEWS	2010-07-13 05:42:32 +0000
+++ NEWS	2011-04-20 23:32:24 +0000
@@ -1,12 +1,174 @@
 This file summarizes the major and interesting changes for each release. For a
 detailled list of changes, please see ChangeLog.
 
-1.15 (UNRELEASED)
+1.20.2 (UNRELEASED)
+-------------------
+Bug fixes:
+ - apport-gtk: HTML-escape text for dialogs with URLs. (LP: #750870)
+ - dump_acpi_tables.py: Check to see if acpi/tables dir is mounted first.
+   Thanks Brian Murray. (LP: #729622)
+ - man/apport-cli.1: Document recently added -w/--window option. Thanks Abhinav
+   Upadhyay! (LP: #765600)
+ - Use kde-open instead of kfmclient to open URLs under KDE. Thanks Philip
+   Muškovac. (LP: #765808)
+
+1.20.1 (2011-03-31)
+-------------------
+Bug fixes:
+ - Add bash completion support for new -w/--window option that was introduced
+   in 1.20. Thanks Philip Muškovac.
+ - apport-unpack: Fix crash if target directory already exists.
+ - Fix crash if UnreportableReason is a non-ASCII string. (LP: #738632)
+ - Fix crash if application from desktop name is a non-ASCII string.
+   (LP: #737799)
+ - unkillable_shutdown: Fix rare crash if ExecutablePath does not exist (any
+   more). (LP: #537904)
+ - kernel_crashdump: Fix crash if the vmcore file disappeared underneath us.
+   (LP: #450295)
+ - unkillable_shutdown: Fix crash if the checked process terminated underneath
+   us. (LP: #540436)
+ - ui.py: Properly raise exceptions from the upload thread that happen at its
+   very end. (LP: #469943)
+
+1.20 (2011-03-17)
+-----------------
+Improvements:
+ - Add support for -w/--window option which will enable user to select a
+   window as a target for filing a problem report. Thanks Abhinav Upadhyay for
+   the patch! (LP: #357847)
+ - Disable the filtering on SIGABRT without assertion messages. Turns out that
+   developers want these crash reports after all. (LP: #729223)
+ - Add support for a "DuplicateSignature" report fields. This allows package
+   hooks to implement custom duplicate problem handling which doesn't need to
+   be hardcoded in Apport itself. Update the launchpad backend to tag such bugs
+   as "need-duplicate-check".
+
+Bug fixes:
+ - report.py, add_hooks_info(): Properly report TypeErrors from hooks.
+ - apport-retrace: Intercept SystemErrors from ill-formed gzip attachments as
+   well.
+ - Fix crash if crash database configuration does not specify a
+   bug_pattern_url. Just assume None. (LP: #731526)
+ - If a custom crash database does not specify a bug_pattern_url, fall back to
+   using the default database's. (LP: #731526)
+ - hookutils.py Update WifiSyslog regex to correctly catch application log
+   messages in syslog. Thanks Mathieu Trudel-Lapierre. (LP: #732917)
+ - hookutils.py, attach_hardware(): Avoid error message if machine does not
+   have a PCI bus. Thanks Marcin Juszkiewicz! (LP: #608449)
+ - backends/packaging-apt-dpkg.py: Replace deprecated getChanges() call with
+   get_changes().
+ - apport-gtk: Fix broken dialog heading if the name of the crashed program
+   contains an & or other markup specific characters.
+ - apport-gtk: Don't crash if GTK cannot be initialized. This usually happens
+   without a $DISPLAY or when the session is being shut down. Just print an
+   error message. If there are pending crashes, they will be shown again the
+   next time a session starts. (LP: #730569)
+
+1.19 (2011-02-28)
+-----------------
+Bug fixes:
+ - Update stack unwind patterns for current glib (slightly changed function
+   names), and also ignore a preceding '*'. (LP: #716251)
+ - Fix crash_signature() to fail if there is an empty or too short
+   StacktraceTop.
+ - apt backend: Do not generate a warning if the opportunistically added -dbg
+   package does not exist.
+ - apt backend: Only add -dbg in --no-pkg mode, as there will be conflicts in
+   normal package mode.
+ - apt backend: Call tar with target cwd instead of using -C; the latter causes
+   an extra openat() call which breaks with current fakechroot.
+ - launchpad.py: Fix retracer crash if DistroRelease field does not exist.
+ - Convert deprecated failIf()/assert_() TestCase method calls to
+   assertFalse()/assertTrue().
+
+Improvements:
+ - In apport-bug, if the user specifies a PID referring to a kernel thread,
+   do the right thing and file the bug against the kernel
+ - In hookutils.attach_dmesg, skip over an initial truncated message if one
+   is present (this happens when the ring buffer overflows)
+ - Change bug patterns to just use one central file instead of per-package
+   files. This allows bug patterns to be written which are not package
+   specific, and is easier to maintain as well. IMPORTANT: This changed the
+   format of crashdb.conf: bug_pattern_base is now obsolete, and the new
+   attribute bug_pattern_url now points to the full URL/path of the patterns
+   file. Thanks to Matt Zimmerman!
+
+1.18 (2011-02-16)
+-----------------
+Bug fixes:
+ - Ensure that symptom scripts define a run() function, and don't show them if
+   not.
+ - Do not show symptom scripts which start with an underscore. These can be
+   used for private libraries for the actual symptom scripts.
+ - Update bash completion. Thanks Philip Muškovac.
+ - etc/default/apport: Remove obsolete "maxsize" setting. (LP: #719564)
+
+Improvements:
+ - Remove explicit handling of KDE *.ui files in setup.py, as
+   python-distutils-extra 2.24 fixes this. Bump version check.
+ - hookutils.py: Add attach_root_command_outputs() to run several commands
+   at once. This avoids asking for the password several times. (LP: #716595)
+
+1.17.2 (2011-02-04)
+-------------------
+Improvements:
+ - Be more Python 3 compatible (not fully working with Python 3 yet, though).
+ - apt/dpkg backend: Drop support for pre-0.7.9 python-apt API.
+ - Add --tag option to add extra tags to reports. (LP: #572504)
+
+Bug fixes:
+ - hookutils.py, attach_dmesg(): Do not overwrite already existing dmesg.
+ - hookutils.py: Be more robust against file permission errors. (LP: #444678)
+ - ui.py: Do not show all the options in --help when invoked as *-bug.
+   (LP: #665953)
+ - launchpad.py: Adapt test cases to current standard_title() behaviour.
+
+1.17.1 (2011-01-10)
+-------------------
+Bug fixes:
+ - Make the GTK frontend work with GTK 2.0 as well, and drop "3.0" requirement.
+
+1.17 (2010-12-31)
+-----------------
+Improvements:
+ - Better standard bug titles for Python crashes. Thanks Matt Zimmerman!
+   (LP: #681574)
+ - Add handler for uncaught Java exceptions. There is no integration for
+   automatically intercepting all Java crashes yet, see java/README.
+   Thanks Matt Zimmerman! (LP: #548877)
+
+Bug fixes:
+ - GTK frontend: Require GTK 3.0.
+ - launchpad.py: Default to "production" instance, not "edge", since edge is
+   obsolete now.
+ - hookutils.py, attach_alsa(): Fix crash if /proc/asound/cards does not exist.
+   (LP: #626215)
+ - ui.py, format_filesize(): Fix to work with stricter locale.format() in
+   Python 2.7. (LP: #688535). While we are at it, also change it to use base-10
+   units.
+ - hookutils.py, package_versions(): Always include all requested package names
+   even if they're unknown to us. Thanks Matt Zimmerman! (LP: #695188)
+ - launchpad.py: When updating a bug, also add new tags. Thanks Brian Murray!
+
+1.16 (2010-11-19)
+-----------------
+New features:
+ - Port GTK frontend from pygtk2 to GTK+3.0 and gobject-introspection.
+
+Bug fixes:
+ - Fix symptoms again. Version 1.15 broke the default symptom directory.
+ - Fix memory test case to work with current Python versions, where the SQLite
+   integrity check throws a different exception.
+
+1.15 (2010-11-11)
 -----------------
 New features:
  - Add dump_acpi_tables.py script. This can be called by package hooks which
    need ACPI table information (in particular, kernel bug reports). Thanks to
    Brad Figg for the script!
+ - Order symptom descriptions alphabetically. Thanks to Javier Collado.
+ - Check $APPORT_SYMPTOMS_DIR environment variable for overriding the system
+   default path. Thanks to Javier Collado.
 
 Bug fixes:
  - testsuite: Check that crashdb.conf can have dynamic code to determine DB
@@ -14,6 +176,30 @@
  - ui.py test suite: Rewrite _gen_test_crash() to have the test process core
    dump itself, instead of using gdb to do it. The latter fails in ptrace
    restricted environments, such as Ubuntu 10.10.
+ - packaging-apt-dpkg.py: Fix handling of /etc/apport/native-origins.d to
+   actually work. Thanks Steve Langasek. (LP: #627777)
+ - apport-kde: Load correct translation catalogue. Thanks Jonathan Riddell.
+   (LP: #633483)
+ - launchpad.py: Use launchpadlib to file a bug instead of screen scraping.
+   The latter was completely broken with current Launchpad, so this makes the
+   test suite actually work again. Thanks to Diogo Matsubara!
+ - launchpad.py: Change $APPORT_STAGING to $APPORT_LAUNCHPAD_INSTANCE, so that
+   you can now specify "staging", "edge", or "dev" (for a local
+   http://launchpad.dev installation). Thanks to Diogo Matsubara!
+ - backends/packaging-apt-dpkg.py: Fix crash on empty lines in ProcMaps
+   attachment.
+ - doc/symptoms.txt: Fix typo, thanks Philip Muskovac. (LP: #590521)
+ - apport/hookutils.py: rename ProcCmdLine to ProcKernelCmdLine to not wipe
+   wipe out /proc/$pid/cmdline information. (LP: #657091)
+ - apport/hookutils.py: attach_file() will not overwrite existing report
+   keys, instead appending "_" until the key is unique.
+ - Fix --save option to recognise ~, thanks Philip Muškovac. (LP: #657278)
+ - Remove escalation_subscription from Ubuntu bug DB definition, turned out to
+   not be useful; thanks Brian Murray.
+ - launchpad.py: Fix APPORT_LAUNCHPAD_INSTANCE values with a https:// prefix.
+ - apt backend: Opportunistically try to install a -dbg package in addition to
+   -dbgsym, to increase the chance that at least one of it exists. Thanks
+   Daniel J Blueman!
 
 1.14.1 (2010-06-24)
 -------------------

=== modified file 'apport/REThread.py'
--- apport/REThread.py	2009-12-23 11:01:21 +0000
+++ apport/REThread.py	2011-04-20 23:32:24 +0000
@@ -64,7 +64,7 @@
 #
 
 if __name__ == '__main__':
-    import unittest, time, traceback, exceptions
+    import unittest, time, traceback
 
     def idle(seconds):
         '''Test thread to just wait a bit.'''
@@ -107,11 +107,11 @@
             t.join()
             # thread did not terminate normally, no return value
             self.assertRaises(AssertionError, t.return_value)
-            self.assert_(t.exc_info()[0] == exceptions.ZeroDivisionError)
+            self.assertTrue(t.exc_info()[0] == ZeroDivisionError)
             exc = traceback.format_exception(t.exc_info()[0], t.exc_info()[1],
                 t.exc_info()[2])
-            self.assert_(exc[-1].startswith('ZeroDivisionError'))
-            self.assert_(exc[-2].endswith('return x / y\n'))
+            self.assertTrue(exc[-1].startswith('ZeroDivisionError'), 'not a ZeroDivisionError:' + str(exc))
+            self.assertTrue(exc[-2].endswith('return x / y\n'))
 
         def test_exc_raise(self):
             '''exc_raise() raises caught thread exception.'''
@@ -128,9 +128,9 @@
                 raised = True
                 e = sys.exc_info()
                 exc = traceback.format_exception(e[0], e[1], e[2])
-                self.assert_(exc[-1].startswith('ZeroDivisionError'))
-                self.assert_(exc[-2].endswith('return x / y\n'))
-            self.assert_(raised)
+                self.assertTrue(exc[-1].startswith('ZeroDivisionError'), 'not a ZeroDivisionError:' + str(e))
+                self.assertTrue(exc[-2].endswith('return x / y\n'))
+            self.assertTrue(raised)
 
     unittest.main()
 

=== modified file 'apport/__init__.py'
--- apport/__init__.py	2009-09-08 12:03:44 +0000
+++ apport/__init__.py	2011-04-20 23:32:24 +0000
@@ -2,11 +2,33 @@
 
 from apport.packaging_impl import impl as packaging
 
+import sys
+
 # fix gettext to output proper unicode strings
 import gettext
 
 def unicode_gettext(str):
     trans = gettext.gettext(str)
-    if type(trans) == type(u''):
+    if isinstance(trans, unicode):
         return trans
     return trans.decode('UTF-8')
+
+def fatal(msg, *args):
+    '''Print out an error message and exit the program.'''
+
+    error(msg, *args)
+    sys.exit(1)
+
+def error(msg, *args):
+    '''Print out an error message.'''
+
+    sys.stderr.write('ERROR: ')
+    sys.stderr.write(msg % args)
+    sys.stderr.write('\n')
+
+def warning(msg, *args):
+    '''Print out an warning message.'''
+
+    sys.stderr.write('WARNING: ')
+    sys.stderr.write(msg % args)
+    sys.stderr.write('\n')

=== modified file 'apport/chroot.py'
--- apport/chroot.py	2009-12-23 11:01:21 +0000
+++ apport/chroot.py	2011-04-20 23:32:24 +0000
@@ -227,7 +227,7 @@
                 os.close(fd)
                 c.tar(tarpath)
                 t = tarfile.open(tarpath)
-                self.assert_(
+                self.assertTrue(
                     # python 2.5's tarfile
                     set(['./bin/42', './bin/hello', './newfile']).issubset(set(t.getnames())) or
                     # python 2.4's tarfile
@@ -236,7 +236,7 @@
 
                 # test cleanup
                 del c
-                self.assert_(os.path.exists(os.path.join(d, 'bin', '42')),
+                self.assertTrue(os.path.exists(os.path.join(d, 'bin', '42')),
                     'directory chroot should not delete the chroot')
 
             finally:
@@ -274,7 +274,7 @@
                 open(os.path.join(c.root, 'newfile'), 'w')
                 c.tar()
                 t = tarfile.open(tar)
-                self.assert_(
+                self.assertTrue(
                     # python 2.5's tarfile
                     set(['./bin/42', './bin/hello', './newfile']).issubset(set(t.getnames())) or
                     # python 2.4's tarfile
@@ -284,7 +284,7 @@
                 # test cleanup
                 d = c.root
                 del c
-                self.assert_(not os.path.exists(d),
+                self.assertTrue(not os.path.exists(d),
                     'tarball chroot should delete the temporary chroot')
             finally:
                 os.unlink(tar)
@@ -364,10 +364,11 @@
                 self.assertEqual(err, '')
                 self.assertEqual(result, 0)
                 files = out.splitlines()
-                self.assert_('bin' in files)
-                self.assert_('lib' in files)
+                self.assertTrue('bin' in files)
+                self.assertTrue('lib' in files)
 
                 # complex shell commands: relative symlinks and paths
+                os.umask(022) # assumed below
                 self.assertEqual(c.run_capture(['bash'], '''set -e
 cd /
 mkdir test

=== modified file 'apport/crashdb.py'
--- apport/crashdb.py	2009-12-23 10:55:52 +0000
+++ apport/crashdb.py	2011-04-20 23:32:24 +0000
@@ -83,7 +83,7 @@
         cur.execute('PRAGMA integrity_check')
         result = cur.fetchall() 
         if result != [('ok',)]:
-            raise SystemError, 'Corrupt duplicate db:' + str(result)
+            raise SystemError('Corrupt duplicate db:' + str(result))
 
     def check_duplicate(self, id, report=None):
         '''Check whether a crash is already known.
@@ -108,7 +108,10 @@
 
         self._mark_dup_checked(id, report)
 
-        sig = report.crash_signature()
+        if 'DuplicateSignature' in report:
+            sig = report['DuplicateSignature']
+        else:
+            sig = report.crash_signature()
         if not sig:
             return None
 
@@ -225,10 +228,10 @@
             # crash got fixed/rejected
             fixed_ver = self.get_fixed_version(id)
             if fixed_ver == 'invalid':
-                print 'DEBUG: bug %i was invalidated, removing from database' % id
+                print('DEBUG: bug %i was invalidated, removing from database' % id)
                 cur2.execute('DELETE FROM crashes WHERE crash_id = ?', [id])
             elif not fixed_ver:
-                print 'WARNING: inconsistency detected: bug #%i does not appear in get_unfixed(), but is not fixed yet' % id
+                print('WARNING: inconsistency detected: bug #%i does not appear in get_unfixed(), but is not fixed yet' % id)
             else:
                 cur2.execute('UPDATE crashes SET fixed_version = ?, last_change = CURRENT_TIMESTAMP WHERE crash_id = ?',
                     (fixed_ver, id))
@@ -328,7 +331,7 @@
 
         This method can raise a NeedsCredentials exception in case of failure.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_comment_url(self, report, handle):
         '''Return an URL that should be opened after report has been uploaded
@@ -338,12 +341,12 @@
         user comments); in that case this function should do whichever
         interactive steps it wants to perform.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def download(self, id):
         '''Download the problem report from given ID and return a Report.'''
 
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def update(self, id, report, comment, change_description=False,
             attachment_comment=None, key_filter=None):
@@ -362,7 +365,7 @@
 
         If key_filter is a list or set, then only those keys will be added.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def update_traces(self, id, report, comment=''):
         '''Update the given report ID for retracing results.
@@ -376,12 +379,12 @@
     def set_credentials(self, username, password):
         '''Set username and password.'''
 
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_distro_release(self, id):
         '''Get 'DistroRelease: <release>' from the report ID.'''
 
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_unretraced(self):
         '''Return set of crash IDs which have not been retraced yet.
@@ -389,7 +392,7 @@
         This should only include crashes which match the current host
         architecture.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_dup_unchecked(self):
         '''Return set of crash IDs which need duplicate checking.
@@ -398,7 +401,7 @@
         Python, since they do not need to be retraced. It should not return
         bugs that are covered by get_unretraced().
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_unfixed(self):
         '''Return an ID set of all crashes which are not yet fixed.
@@ -409,7 +412,7 @@
         there are any errors with connecting to the crash database, it should
         raise an exception (preferably IOError).
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_fixed_version(self, id):
         '''Return the package version that fixes a given crash.
@@ -423,17 +426,17 @@
         there are any errors with connecting to the crash database, it should
         raise an exception (preferably IOError).
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_affected_packages(self, id):
         '''Return list of affected source packages for given ID.'''
 
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def is_reporter(self, id):
         '''Check whether the user is the reporter of given ID.'''
 
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def can_update(self, id):
         '''Check whether the user is eligible to update a report.
@@ -443,32 +446,32 @@
         exact policy and checks should be done according to  the particular
         implementation.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def duplicate_of(self, id):
         '''Return master ID for a duplicate bug.
 
         If the bug is not a duplicate, return None.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def close_duplicate(self, id, master):
         '''Mark a crash id as duplicate of given master ID.
         
         If master is None, id gets un-duplicated.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def mark_regression(self, id, master):
         '''Mark a crash id as reintroducing an earlier crash which is
         already marked as fixed (having ID 'master').'''
         
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def mark_retraced(self, id):
         '''Mark crash id as retraced.'''
 
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def mark_retrace_failed(self, id, invalid_msg=None):
         '''Mark crash id as 'failed to retrace'.
@@ -478,14 +481,14 @@
         
         This can be a no-op if you are not interested in this.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def _mark_dup_checked(self, id, report):
         '''Mark crash id as checked for being a duplicate
         
         This is an internal method that should not be called from outside.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
 #
 # factory 
@@ -508,7 +511,7 @@
     - A dictionary 'databases' which maps names to crash db configuration
       dictionaries. These need to have at least the keys 'impl' (Python module
       in apport.crashdb_impl which contains a concrete 'CrashDatabase' class
-      implementation for that crash db type) and 'bug_pattern_base', which
+      implementation for that crash db type) and 'bug_pattern_url', which
       specifies an URL for bug patterns (or None if those are not used for that
       crash db).
     '''
@@ -525,9 +528,9 @@
             if os.path.isfile(cfpath) and cf.endswith('.conf'):
                 try:
                     execfile(cfpath, settings['databases'])
-                except Exception, e:
+                except Exception as e:
                     # ignore broken files
-                    print >> sys.stderr, 'Invalid file %s: %s' % (cfpath, str(e))
+                    sys.stderr.write('Invalid file %s: %s\n' % (cfpath, str(e)))
                     pass
 
     if not name:
@@ -535,8 +538,13 @@
 
     db = settings['databases'][name]
 
+    bug_pattern_url = db.get('bug_pattern_url')
+    if not bug_pattern_url:
+        # fall back to default database's
+        bug_pattern_url = settings['databases'][settings['default']].get('bug_pattern_url')
+
     m = __import__('apport.crashdb_impl.' + db['impl'], globals(), locals(), ['CrashDatabase'])
-    return m.CrashDatabase(auth_file, db['bug_pattern_base'], db)
+    return m.CrashDatabase(auth_file, bug_pattern_url, db)
 
 class NeedsCredentials(Exception):
     '''This may be raised when unable to log in to the crashdb.'''

=== modified file 'apport/crashdb_impl/launchpad.py'
--- apport/crashdb_impl/launchpad.py	2010-06-16 13:50:47 +0000
+++ apport/crashdb_impl/launchpad.py	2011-04-20 23:32:24 +0000
@@ -10,12 +10,15 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
-import urllib, tempfile, shutil, os.path, re, gzip, sys, socket, ConfigParser
+import urllib, tempfile, os.path, re, gzip, sys
 import email
-from cStringIO import StringIO
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 from launchpadlib.errors import HTTPError
-from launchpadlib.launchpad import Launchpad, STAGING_SERVICE_ROOT, EDGE_SERVICE_ROOT
+from launchpadlib.launchpad import Launchpad
 
 import apport.crashdb
 import apport
@@ -26,8 +29,8 @@
     for attachment in attachments:
         try:
             f = attachment.data.open()
-        except HTTPError, e:
-            print >> sys.stderr, 'ERROR: Broken attachment on bug, ignoring'
+        except HTTPError:
+            apport.error('Broken attachment on bug, ignoring')
             continue
         name = f.filename
         if name.endswith('.txt') or name.endswith('.gz'):
@@ -52,8 +55,9 @@
         - distro: Name of the distribution in Launchpad
         - project: Name of the project in Launchpad
         (Note that exactly one of "distro" or "project" must be given.)
-        - staging: If set, this uses staging instead of production (optional).
-          This can be overriden or set by $APPORT_STAGING environment.
+        - launchpad_instance: If set, this uses the given launchpad instance
+          instead of production (optional). This can be overriden or set by
+          $APPORT_LAUNCHPAD_INSTANCE environment.
         - cache_dir: Path to a permanent cache directory; by default it uses a
           temporary one. (optional). This can be overridden or set by
           $APPORT_LAUNCHPAD_CACHE environment.
@@ -62,11 +66,13 @@
         - escalation_tag: This adds the given tag to a bug once it gets more
           than 10 duplicates.
         '''
-        if os.getenv('APPORT_STAGING'):
-            options['staging'] = True
+        if os.getenv('APPORT_LAUNCHPAD_INSTANCE'):
+            options['launchpad_instance'] = os.getenv(
+                'APPORT_LAUNCHPAD_INSTANCE')
         if not auth:
-            if options.get('staging'):
-                auth = default_credentials_path + '.staging'
+            lp_instance = options.get('launchpad_instance')
+            if lp_instance:
+                auth = default_credentials_path + '.' + lp_instance.split('://', 1)[-1]
             else:
                 auth = default_credentials_path
         apport.crashdb.CrashDatabase.__init__(self, auth,
@@ -94,10 +100,10 @@
         if self.__launchpad:
             return self.__launchpad
 
-        if self.options.get('staging'):
-            launchpad_instance = STAGING_SERVICE_ROOT
+        if self.options.get('launchpad_instance'):
+            launchpad_instance = self.options.get('launchpad_instance')
         else:
-            launchpad_instance = EDGE_SERVICE_ROOT
+            launchpad_instance = 'production'
 
         auth_dir = os.path.dirname(self.auth)
         if auth_dir and not os.path.isdir(auth_dir):
@@ -109,12 +115,12 @@
                     allow_access_levels=['WRITE_PRIVATE'],
                     credentials_file = self.auth,
                     version='1.0')
-        except Exception, e:
+        except Exception as e:
             if hasattr(e, 'content'):
                 msg = e.content
             else:
                 msg = str(e)
-            print >> sys.stderr, 'Error connecting to Launchpad: %s\nYou can reset the credentials by removing the file "%s"' % (msg, self.auth)
+            apport.error('connecting to Launchpad failed: %s\nYou can reset the credentials by removing the file "%s"', msg, self.auth)
             sys.exit(99) # transient error
 
         return self.__launchpad
@@ -168,6 +174,8 @@
                 hdr['Private'] = 'yes'
                 hdr['Subscribers'] = 'apport'
                 hdr['Tags'] += ' need-duplicate-check'
+        if 'DuplicateSignature' in report and 'need-duplicate-check' not in hdr['Tags']:
+                hdr['Tags'] += ' need-duplicate-check'
 
         # if we have checkbox submission key, link it to the bug; keep text
         # reference until the link is shown in Launchpad's UI
@@ -185,10 +193,23 @@
         mime.seek(0)
 
         ticket = upload_blob(mime, progress_callback,
-                staging=self.options.get('staging', False))
+                hostname=self.get_hostname())
         assert ticket
         return ticket
 
+    def get_hostname(self):
+        '''Return the hostname for the Launchpad instance.'''
+
+        launchpad_instance = self.options.get('launchpad_instance')
+        if launchpad_instance:
+            if launchpad_instance == 'staging':
+                hostname = 'staging.launchpad.net'
+            else:
+                hostname = 'launchpad.dev'
+        else:
+            hostname = 'launchpad.net'
+        return hostname
+
     def get_comment_url(self, report, handle):
         '''Return an URL that should be opened after report has been uploaded
         and upload() returned handle.
@@ -202,13 +223,10 @@
         if title:
             args['field.title'] = title
 
-        if self.options.get('staging'):
-            hostname = 'staging.launchpad.net'
-        else:
-            hostname = 'launchpad.net'
+        hostname = self.get_hostname()
 
         project = self.options.get('project')
-        
+
         if not project:
             if report.has_key('SourcePackage'):
                 return 'https://bugs.%s/%s/+source/%s/+filebug/%s?%s' % (
@@ -269,7 +287,7 @@
             elif 'apport-package' in b.tags:
                 report['ProblemType'] = 'Package'
             else:
-                raise ValueError, 'cannot determine ProblemType from tags: ' + str(b.tags)
+                raise ValueError('cannot determine ProblemType from tags: ' + str(b.tags))
 
         report['Tags'] = ' '.join(b.tags)
 
@@ -290,7 +308,7 @@
             elif ext == '.gz':
                 try:
                     report[key] = gzip.GzipFile(fileobj=attachment).read()
-                except IOError, e:
+                except IOError as e:
                     # some attachments are only called .gz, but are
                     # uncompressed (LP #574360)
                     if 'Not a gzip' not in str(e):
@@ -298,7 +316,7 @@
                     attachment.seek(0)
                     report[key] = attachment.read()
             else:
-                raise Exception, 'Unknown attachment type: ' + attachment.filename
+                raise Exception('Unknown attachment type: ' + attachment.filename)
         return report
 
     def update(self, id, report, comment, change_description=False,
@@ -350,6 +368,9 @@
             # with apport-collect
             x = bug.tags[:] # LP#254901 workaround
             x.append('apport-collected')
+            # add any tags (like the release) to the bug
+            if report.has_key('Tags'):
+                x += report['Tags'].split()
             bug.tags = x
             bug.lp_save()
             bug = self.launchpad.bugs[id] # fresh bug object, LP#336866 workaround
@@ -412,7 +433,7 @@
         m = re.search('DistroRelease: ([-a-zA-Z0-9.+/ ]+)', bug.description)
         if m:
             return m.group(1)
-        raise ValueError, 'URL does not contain DistroRelease: field'
+        raise ValueError('URL does not contain DistroRelease: field')
 
     def get_affected_packages(self, id):
         '''Return list of affected source packages for given ID.'''
@@ -544,7 +565,7 @@
                     return ''
                 
             if len(fixed_tasks) > 1: 
-                print >> sys.stderr, 'WARNING: There is more than one task fixed in %s %s, using first one to determine fixed version' % (self.distro, id)
+                apport.warning('There is more than one task fixed in %s %s, using first one to determine fixed version', self.distro, id)
                 return ''
 
             if fixed_tasks:
@@ -727,7 +748,7 @@
         #FIXME: this entire function is an ugly Ubuntu specific hack until LP
         #gets a real crash db; see https://wiki.ubuntu.com/CrashReporting
 
-        if report['DistroRelease'].split()[0] != 'Ubuntu':
+        if report.get('DistroRelease', '').split()[0] != 'Ubuntu':
             return # only Ubuntu bugs are filed private
         
         #use a url hack here, it is faster
@@ -780,7 +801,7 @@
     def https_open(self, req):
         return self.do_open(HTTPSProgressConnection, req)
 
-def upload_blob(blob, progress_callback = None, staging=False):
+def upload_blob(blob, progress_callback = None, hostname='launchpad.net'):
     '''Upload blob (file-like object) to Launchpad.
 
     progress_callback can be set to a function(sent, total) which is regularly
@@ -790,8 +811,9 @@
 
     Return None on error, or the ticket number on success.
 
-    By default this uses the production Launchpad instance. Set staging=True to
-    use staging.launchpad.net (for testing).
+    By default this uses the production Launchpad hostname. Set
+    hostname to 'launchpad.dev' or 'staging.launchpad.net' to use another
+    instance for testing.
     '''
     ticket = None
 
@@ -799,10 +821,7 @@
     _https_upload_callback = progress_callback
 
     opener = urllib2.build_opener(HTTPSProgressHandler, multipartpost_handler.MultipartPostHandler)
-    if staging:
-        url = 'https://staging.launchpad.net/+storeblob'
-    else:
-        url = 'https://launchpad.net/+storeblob'
+    url = 'https://%s/+storeblob' % hostname
     result = opener.open(url,
         { 'FORM_SUBMIT': '1', 'field.blob': blob })
     ticket = result.info().get('X-Launchpad-Blob-Token')
@@ -814,7 +833,7 @@
 #
 
 if __name__ == '__main__':
-    import unittest, urllib2, cookielib
+    import unittest, urllib2
 
     crashdb = None
     segv_report = None
@@ -825,8 +844,6 @@
         # binary package 'coreutils'
         test_package = 'coreutils'
         test_srcpackage = 'coreutils'
-        known_test_id = 302779
-        known_test_id2 = 89040
 
         #
         # Generic tests, should work for all CrashDB implementations
@@ -845,6 +862,54 @@
             self.ref_report.add_user_info()
             self.ref_report['SourcePackage'] = 'coreutils'
 
+            # Objects tests rely on.
+            self.uncommon_description_bug = self._file_uncommon_description_bug()
+            self._create_project('langpack-o-matic')
+
+            # XXX Should create new bug reports, not reuse those.
+            self.known_test_id = self.uncommon_description_bug.id
+            self.known_test_id2 = self._file_uncommon_description_bug().id
+
+        def _create_project(self, name):
+            '''Create a project using launchpadlib to be used by tests.'''
+
+            project = self.crashdb.launchpad.projects[name]
+            if not project:
+                self.crashdb.launchpad.projects.new_project(
+                    description=name + 'description',
+                    display_name=name,
+                    name=name,
+                    summary=name + 'summary',
+                    title=name + 'title')
+
+        def _file_uncommon_description_bug(self):
+            '''File a bug report with an uncommon description.
+
+            Example taken from real LP bug 269539. It contains only
+            ProblemType/Architecture/DistroRelease in the description, and has
+            free-form description text after the Apport data.
+            '''
+            desc = '''problem
+
+ProblemType: Package
+Architecture: amd64
+DistroRelease: Ubuntu 8.10
+
+more text
+
+and more
+'''
+            return self.crashdb.launchpad.bugs.createBug(
+                title=u'mixed description bug',
+                description=desc,
+                target=self.crashdb.lp_distro)
+
+        @property
+        def hostname(self):
+            '''Get the Launchpad hostname for the given crashdb.'''
+
+            return self.crashdb.get_hostname()
+
         def _file_segv_report(self):
             '''File a SEGV crash report.
 
@@ -862,12 +927,12 @@
             r['LongGibberish'] = 'a\nb\nc\nd\ne\n\xff\xff\xff\n\f'
 
             handle = self.crashdb.upload(r)
-            self.assert_(handle)
-            url = self.crashdb.get_comment_url(r, handle)
-            self.assert_(url)
+            self.assertTrue(handle)
+            bug_target = self._get_bug_target(self.crashdb, r)
+            self.assertTrue(bug_target)
 
-            id = self._fill_bug_form(url)
-            self.assert_(id > 0)
+            id = self._file_bug(bug_target, r, handle)
+            self.assertTrue(id > 0)
             return id
 
         def test_1_report_segv(self):
@@ -878,7 +943,7 @@
             global segv_report
             id = self._file_segv_report()
             segv_report = id
-            print >> sys.stderr, '(https://staging.launchpad.net/bugs/%i) ' % id,
+            sys.stderr.write('(https://%s/bugs/%i) ' % (self.hostname, id))
 
         def test_1_report_python(self):
             '''upload() and get_comment_url() for Python crash
@@ -889,24 +954,25 @@
             r['ExecutablePath'] = '/bin/foo'
             r['Traceback'] = '''Traceback (most recent call last):
   File "/bin/foo", line 67, in fuzz
-    print weird
+    print(weird)
 NameError: global name 'weird' is not defined'''
             r['Tags'] = 'boogus pybogus'
             r.add_package_info(self.test_package)
             r.add_os_info()
             r.add_user_info()
-            self.assertEqual(r.standard_title(), 'foo crashed with NameError in fuzz()')
+            self.assertEqual(r.standard_title(), 
+                "foo crashed with NameError in fuzz(): global name 'weird' is not defined")
 
             handle = self.crashdb.upload(r)
-            self.assert_(handle)
-            url = self.crashdb.get_comment_url(r, handle)
-            self.assert_(url)
+            self.assertTrue(handle)
+            bug_target = self._get_bug_target(self.crashdb, r)
+            self.assertTrue(bug_target)
 
-            id = self._fill_bug_form(url)
-            self.assert_(id > 0)
+            id = self._file_bug(bug_target, r, handle)
+            self.assertTrue(id > 0)
             global python_report
             python_report = id
-            print >> sys.stderr, '(https://staging.launchpad.net/bugs/%i) ' % id,
+            sys.stderr.write('(https://%s/bugs/%i) ' % (self.hostname, id))
 
         def test_2_download(self):
             '''download()'''
@@ -925,16 +991,16 @@
                 apport.packaging.get_system_architecture()]))
 
             self.assertEqual(r['Signal'], '11')
-            self.assert_(r['ExecutablePath'].endswith('/crash'))
+            self.assertTrue(r['ExecutablePath'].endswith('/crash'))
             self.assertEqual(r['SourcePackage'], self.test_srcpackage)
-            self.assert_(r['Package'].startswith(self.test_package + ' '))
-            self.assert_('f (x=42)' in r['Stacktrace'])
-            self.assert_('f (x=42)' in r['StacktraceTop'])
-            self.assert_('f (x=42)' in r['ThreadStacktrace'])
-            self.assert_(len(r['CoreDump']) > 1000)
-            self.assert_('Dependencies' in r)
-            self.assert_('Disassembly' in r)
-            self.assert_('Registers' in r)
+            self.assertTrue(r['Package'].startswith(self.test_package + ' '))
+            self.assertTrue('f (x=42)' in r['Stacktrace'])
+            self.assertTrue('f (x=42)' in r['StacktraceTop'])
+            self.assertTrue('f (x=42)' in r['ThreadStacktrace'])
+            self.assertTrue(len(r['CoreDump']) > 1000)
+            self.assertTrue('Dependencies' in r)
+            self.assertTrue('Disassembly' in r)
+            self.assertTrue('Registers' in r)
 
             # check tags
             r = self.crashdb.download(python_report)
@@ -946,12 +1012,12 @@
             '''update_traces()'''
 
             r = self.crashdb.download(segv_report)
-            self.assert_('CoreDump' in r)
-            self.assert_('Dependencies' in r)
-            self.assert_('Disassembly' in r)
-            self.assert_('Registers' in r)
-            self.assert_('Stacktrace' in r)
-            self.assert_('ThreadStacktrace' in r)
+            self.assertTrue('CoreDump' in r)
+            self.assertTrue('Dependencies' in r)
+            self.assertTrue('Disassembly' in r)
+            self.assertTrue('Registers' in r)
+            self.assertTrue('Stacktrace' in r)
+            self.assertTrue('ThreadStacktrace' in r)
 
             # updating with an useless stack trace retains core dump
             r['StacktraceTop'] = '?? ()'
@@ -960,17 +1026,17 @@
             r['FooBar'] = 'bogus'
             self.crashdb.update_traces(segv_report, r, 'I can has a better retrace?')
             r = self.crashdb.download(segv_report)
-            self.assert_('CoreDump' in r)
-            self.assert_('Dependencies' in r)
-            self.assert_('Disassembly' in r)
-            self.assert_('Registers' in r)
-            self.assert_('Stacktrace' in r) # TODO: ascertain that it's the updated one
-            self.assert_('ThreadStacktrace' in r)
-            self.failIf('FooBar' in r)
+            self.assertTrue('CoreDump' in r)
+            self.assertTrue('Dependencies' in r)
+            self.assertTrue('Disassembly' in r)
+            self.assertTrue('Registers' in r)
+            self.assertTrue('Stacktrace' in r) # TODO: ascertain that it's the updated one
+            self.assertTrue('ThreadStacktrace' in r)
+            self.assertFalse('FooBar' in r)
 
             tags = self.crashdb.launchpad.bugs[segv_report].tags
-            self.assert_('apport-crash' in tags)
-            self.failIf('apport-collected' in tags)
+            self.assertTrue('apport-crash' in tags)
+            self.assertFalse('apport-collected' in tags)
 
             # updating with an useful stack trace removes core dump
             r['StacktraceTop'] = 'read () from /lib/libc.6.so\nfoo (i=1) from /usr/lib/libfoo.so'
@@ -978,13 +1044,13 @@
             r['ThreadStacktrace'] = 'thread\neven longer\ntrace'
             self.crashdb.update_traces(segv_report, r, 'good retrace!')
             r = self.crashdb.download(segv_report)
-            self.failIf('CoreDump' in r)
-            self.assert_('Dependencies' in r)
-            self.assert_('Disassembly' in r)
-            self.assert_('Registers' in r)
-            self.assert_('Stacktrace' in r)
-            self.assert_('ThreadStacktrace' in r)
-            self.failIf('FooBar' in r)
+            self.assertFalse('CoreDump' in r)
+            self.assertTrue('Dependencies' in r)
+            self.assertTrue('Disassembly' in r)
+            self.assertTrue('Registers' in r)
+            self.assertTrue('Stacktrace' in r)
+            self.assertTrue('ThreadStacktrace' in r)
+            self.assertFalse('FooBar' in r)
 
             # test various situations which caused crashes
             r['Stacktrace'] = '' # empty file
@@ -995,11 +1061,14 @@
         def test_update_description(self):
             '''update() with changing description'''
 
-            id = self._fill_bug_form(
-                'https://bugs.staging.launchpad.net/%s/+source/bash/+filebug?'
-                    'field.title=testbug&field.actions.search=' % self.crashdb.distro)
-            self.assert_(id > 0)
-            print >> sys.stderr, '(https://staging.launchpad.net/bugs/%i) ' % id,
+            bug_target = self.crashdb.lp_distro.getSourcePackage(name='bash')
+            bug = self.crashdb.launchpad.bugs.createBug(
+                description='test description for test bug.',
+                target=bug_target,
+                title='testbug')
+            id = bug.id
+            self.assertTrue(id > 0)
+            sys.stderr.write('(https://%s/bugs/%i) ' % (self.hostname, id))
 
             r = apport.Report('Bug')
 
@@ -1024,14 +1093,16 @@
         def test_update_comment(self):
             '''update() with appending comment'''
 
+            bug_target = self.crashdb.lp_distro.getSourcePackage(name='bash')
             # we need to fake an apport description separator here, since we
             # want to be lazy and use download() for checking the result
-            id = self._fill_bug_form(
-                'https://bugs.staging.launchpad.net/%s/+source/bash/+filebug?'
-                    'field.title=testbug&field.actions.search=' %
-                    self.crashdb.distro, comment='Pr0blem\n\n--- \nProblemType: Bug')
-            self.assert_(id > 0)
-            print >> sys.stderr, '(https://staging.launchpad.net/bugs/%i) ' % id,
+            bug = self.crashdb.launchpad.bugs.createBug(
+                description='Pr0blem\n\n--- \nProblemType: Bug',
+                target=bug_target,
+                title='testbug')
+            id = bug.id
+            self.assertTrue(id > 0)
+            sys.stderr.write('(https://%s/bugs/%i) ' % (self.hostname, id))
 
             r = apport.Report('Bug')
 
@@ -1045,8 +1116,8 @@
 
             r = self.crashdb.download(id)
 
-            self.failIf('OneLiner' in r)
-            self.failIf('ShortGoo' in r)
+            self.assertFalse('OneLiner' in r)
+            self.assertFalse('ShortGoo' in r)
             self.assertEqual(r['ProblemType'], 'Bug')
             self.assertEqual(r['DpkgTerminalLog'], 'one\ntwo\nthree\nfour\nfive\nsix')
             self.assertEqual(r['VarLogDistupgradeBinGoo'], '\x01' * 1024)
@@ -1057,11 +1128,14 @@
         def test_update_filter(self):
             '''update() with a key filter'''
 
-            id = self._fill_bug_form(
-                'https://bugs.staging.launchpad.net/%s/+source/bash/+filebug?'
-                    'field.title=testbug&field.actions.search=' % self.crashdb.distro)
-            self.assert_(id > 0)
-            print >> sys.stderr, '(https://staging.launchpad.net/bugs/%i) ' % id,
+            bug_target = self.crashdb.lp_distro.getSourcePackage(name='bash')
+            bug = self.crashdb.launchpad.bugs.createBug(
+                description='test description for test bug',
+                target=bug_target,
+                title='testbug')
+            id = bug.id
+            self.assertTrue(id > 0)
+            sys.stderr.write('(https://%s/bugs/%i) ' % (self.hostname, id))
 
             r = apport.Report('Bug')
 
@@ -1076,11 +1150,11 @@
 
             r = self.crashdb.download(id)
 
-            self.failIf('OneLiner' in r)
+            self.assertFalse('OneLiner' in r)
             self.assertEqual(r['ShortGoo'], 'lineone\nlinetwo')
             self.assertEqual(r['ProblemType'], 'Bug')
             self.assertEqual(r['DpkgTerminalLog'], 'one\ntwo\nthree\nfour\nfive\nsix')
-            self.failIf('VarLogDistupgradeBinGoo' in r)
+            self.assertFalse('VarLogDistupgradeBinGoo' in r)
 
             self.assertEqual(self.crashdb.launchpad.bugs[id].tags, [])
 
@@ -1099,14 +1173,14 @@
         def test_is_reporter(self):
             '''is_reporter()'''
 
-            self.assert_(self.crashdb.is_reporter(segv_report))
-            self.failIf(self.crashdb.is_reporter(1))
+            self.assertTrue(self.crashdb.is_reporter(segv_report))
+            self.assertFalse(self.crashdb.is_reporter(1))
 
         def test_can_update(self):
             '''can_update()'''
 
-            self.assert_(self.crashdb.can_update(segv_report))
-            self.failIf(self.crashdb.can_update(1))
+            self.assertTrue(self.crashdb.can_update(segv_report))
+            self.assertFalse(self.crashdb.can_update(1))
 
         def test_duplicates(self):
             '''duplicate handling'''
@@ -1131,10 +1205,10 @@
             # this should have removed attachments; note that Stacktrace is
             # short, and thus inline
             r = self.crashdb.download(segv_report)
-            self.failIf('CoreDump' in r)
-            self.failIf('Dependencies' in r)
-            self.failIf('Disassembly' in r)
-            self.failIf('Registers' in r)
+            self.assertFalse('CoreDump' in r)
+            self.assertFalse('Dependencies' in r)
+            self.assertFalse('Disassembly' in r)
+            self.assertFalse('Registers' in r)
 
             # now try duplicating to a duplicate bug; this should automatically
             # transition to the master bug
@@ -1160,11 +1234,11 @@
 
             # mark_retraced()
             unretraced_before = self.crashdb.get_unretraced()
-            self.assert_(segv_report in unretraced_before)
-            self.failIf(python_report in unretraced_before)
+            self.assertTrue(segv_report in unretraced_before)
+            self.assertFalse(python_report in unretraced_before)
             self.crashdb.mark_retraced(segv_report)
             unretraced_after = self.crashdb.get_unretraced()
-            self.failIf(segv_report in unretraced_after)
+            self.assertFalse(segv_report in unretraced_after)
             self.assertEqual(unretraced_before,
                     unretraced_after.union(set([segv_report])))
             self.assertEqual(self.crashdb.get_fixed_version(segv_report), None)
@@ -1174,7 +1248,7 @@
             self.crashdb.mark_retraced(segv_report)
             self.crashdb.mark_retrace_failed(segv_report)
             unretraced_after = self.crashdb.get_unretraced()
-            self.failIf(segv_report in unretraced_after)
+            self.assertFalse(segv_report in unretraced_after)
             self.assertEqual(unretraced_before,
                     unretraced_after.union(set([segv_report])))
             self.assertEqual(self.crashdb.get_fixed_version(segv_report), None)
@@ -1184,7 +1258,7 @@
             self.crashdb.mark_retraced(segv_report)
             self.crashdb.mark_retrace_failed(segv_report, "I don't like you")
             unretraced_after = self.crashdb.get_unretraced()
-            self.failIf(segv_report in unretraced_after)
+            self.assertFalse(segv_report in unretraced_after)
             self.assertEqual(unretraced_before,
                     unretraced_after.union(set([segv_report])))
             self.assertEqual(self.crashdb.get_fixed_version(segv_report),
@@ -1194,11 +1268,11 @@
             '''processing status markings for interpreter crashes'''
 
             unchecked_before = self.crashdb.get_dup_unchecked()
-            self.assert_(python_report in unchecked_before)
-            self.failIf(segv_report in unchecked_before)
+            self.assertTrue(python_report in unchecked_before)
+            self.assertFalse(segv_report in unchecked_before)
             self.crashdb._mark_dup_checked(python_report, self.ref_report)
             unchecked_after = self.crashdb.get_dup_unchecked()
-            self.failIf(python_report in unchecked_after)
+            self.assertFalse(python_report in unchecked_after)
             self.assertEqual(unchecked_before,
                     unchecked_after.union(set([python_report])))
             self.assertEqual(self.crashdb.get_fixed_version(python_report),
@@ -1211,7 +1285,7 @@
             invalidated by marking it as a duplicate.
             '''
             id = self._file_segv_report()
-            print >> sys.stderr, '(https://staging.launchpad.net/bugs/%i) ' % id,
+            sys.stderr.write('(https://%s/bugs/%i) ' % (self.hostname, id))
 
             r = self.crashdb.download(id)
 
@@ -1224,7 +1298,7 @@
             self.crashdb.update_traces(id, r, 'good retrace!')
 
             r = self.crashdb.download(id)
-            self.failIf('CoreDump' in r)
+            self.assertFalse('CoreDump' in r)
 
         def test_get_fixed_version(self):
             '''get_fixed_version() for fixed bugs
@@ -1235,7 +1309,7 @@
             self._mark_report_fixed(segv_report)
             fixed_ver = self.crashdb.get_fixed_version(segv_report)
             self.assertNotEqual(fixed_ver, None)
-            self.assert_(fixed_ver[0].isdigit())
+            self.assertTrue(fixed_ver[0].isdigit())
             self._mark_report_new(segv_report)
             self.assertEqual(self.crashdb.get_fixed_version(segv_report), None)
 
@@ -1247,119 +1321,99 @@
         def _get_instance(klass):
             '''Create a CrashDB instance'''
 
-            return CrashDatabase(os.environ.get('LP_CREDENTIALS'), '', 
-                    {'distro': 'ubuntu', 'staging': True})
-
-        def _fill_bug_form(self, url, comment=None):
-            '''Fill form for a distro bug and commit the bug.
-
-            Return the report ID.
-            '''
-            cj = cookielib.MozillaCookieJar()
-            cj.load(os.path.expanduser('~/.lpcookie.txt'))
-            opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
-            opener.addheaders = [('Referer', url)]
-
-            re_pkg = re.compile('\+source/([\w]+)/')
-            re_title = re.compile('<input.*id="field.title".*value="([^"]+)"')
-            re_tags = re.compile('<input.*id="field.tags".*value="([^"]*)"')
-
-            # parse default field values from reporting page
-            while True:
-                res = opener.open(url)
-                try:
-                    self.assertEqual(res.getcode(), 200)
-                except AttributeError:
-                    pass # getcode() is new in Python 2.6
-                content = res.read()
-
-                if 'Please wait while bug data is processed' in content:
-                    print '.',
-                    sys.stdout.flush()
-                    time.sleep(5)
-                    continue
-
-                break
-
-            m_pkg = re_pkg.search(url)
-            m_title = re_title.search(content)
-            m_tags = re_tags.search(content)
-
-            # strip off GET arguments from URL
-            url = url.split('?')[0]
-
-            # create request to file bug
-            args = {
-                'packagename_option': 'choose',
-                'field.packagename': m_pkg.group(1),
-                'field.title': m_title.group(1),
-                'field.tags': m_tags.group(1),
-                'field.comment': comment or 'ZOMG!',
-                'field.actions.submit_bug': '1',
-            }
-
-            res = opener.open(url, data=urllib.urlencode(args))
-            try:
-                self.assertEqual(res.getcode(), 200)
-            except AttributeError:
-                pass # getcode() is new in Python 2.6
-            self.assert_('+source/%s/+bug/' % m_pkg.group(1) in res.geturl())
-            id = res.geturl().split('/')[-1]
-            return int(id)
-
-        def _fill_bug_form_project(self, url):
-            '''Fill form for a project bug and commit the bug.
-
-            Return the report ID.
-            '''
-            cj = cookielib.MozillaCookieJar()
-            cj.load(os.path.expanduser('~/.lpcookie.txt'))
-            opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
-            opener.addheaders = [('Referer', url)]
-
-            m = re.search('launchpad.net/([^/]+)/\+filebug', url)
-            assert m
-            project = m.group(1)
-
-            re_title = re.compile('<input.*id="field.title".*value="([^"]+)"')
-            re_tags = re.compile('<input.*id="field.tags".*value="([^"]+)"')
-
-            # parse default field values from reporting page
-            while True:
-                res = opener.open(url)
-                try:
-                    self.assertEqual(res.getcode(), 200)
-                except AttributeError:
-                    pass # getcode() is new in Python 2.6
-                content = res.read()
-
-                if 'Please wait while bug data is processed' in content:
-                    print '.',
-                    sys.stdout.flush()
-                    time.sleep(5)
-                    continue
-
-                break
-
-            m_title = re_title.search(content)
-            m_tags = re_tags.search(content)
-
-            # strip off GET arguments from URL
-            url = url.split('?')[0]
-
-            # create request to file bug
-            args = {
-                'field.title': m_title.group(1),
-                'field.tags': m_tags.group(1),
-                'field.comment': 'ZOMG!',
-                'field.actions.submit_bug': '1',
-            }
-
-            res = opener.open(url, data=urllib.urlencode(args))
-            self.assertEqual(res.getcode(), 200)
-            self.assert_(('launchpad.net/%s/+bug' % project) in res.geturl())
-            id = res.geturl().split('/')[-1]
-            return int(id)
+            launchpad_instance = os.environ.get('APPORT_LAUNCHPAD_INSTANCE') or 'staging'
+
+            return CrashDatabase(os.environ.get('LP_CREDENTIALS'), '',
+                    {'distro': 'ubuntu',
+                     'launchpad_instance': launchpad_instance})
+
+        @classmethod
+        def _get_bug_target(klass, db, report):
+            '''Return the bug_target for this report.'''
+
+            project = db.options.get('project')
+            if report.has_key('SourcePackage'):
+                return db.lp_distro.getSourcePackage(name=report['SourcePackage'])
+            elif project:
+                return db.launchpad.projects[project]
+            else:
+                return self.lp_distro
+
+        def _get_librarian_hostname(self):
+            '''Return the librarian hostname according to the LP hostname used.'''
+
+            hostname = self.crashdb.get_hostname()
+            if 'staging' in hostname:
+                return 'staging.launchpadlibrarian.net'
+            else:
+                return 'launchpad.dev:58080'
+
+        def _file_bug(self, bug_target, report, handle, comment=None):
+            '''File a bug report.'''
+
+            bug_title = report.get('Title', report.standard_title())
+
+            blob_info = self.crashdb.launchpad.temporary_blobs.fetch(
+                token=handle)
+            # XXX 2010-08-03 matsubara bug=612990:
+            #     Can't fetch the blob directly, so let's load it from the
+            #     representation.
+            blob = self.crashdb.launchpad.load(blob_info['self_link'])
+            #XXX Need to find a way to trigger the job that process the blob
+            # rather polling like this. This makes the test suite take forever
+            # to run.
+            while not blob.hasBeenProcessed():
+                time.sleep(1)
+
+            # processed_blob contains info about privacy, additional comments
+            # and attachments.
+            processed_blob = blob.getProcessedData()
+
+            bug = self.crashdb.launchpad.bugs.createBug(
+                description=processed_blob['extra_description'],
+                private=processed_blob['private'],
+                tags=processed_blob['initial_tags'],
+                target=bug_target,
+                title=bug_title)
+
+            for comment in processed_blob['comments']:
+                bug.newMessage(content=comment)
+
+            # Ideally, one would be able to retrieve the attachment content
+            # from the ProblemReport object or from the processed_blob.
+            # Unfortunately the processed_blob only give us the Launchpad
+            # librarian file_alias_id, so that's why we need to
+            # download it again and upload to the bug report. It'd be even
+            # better if addAttachment could work like linkAttachment, the LP
+            # api used in the +filebug web UI, but there are security concerns
+            # about the way linkAttachment works.
+            librarian_url = 'http://%s' % self._get_librarian_hostname()
+            for attachment in processed_blob['attachments']:
+                filename = description = attachment['description']
+                # Download the attachment data.
+                data = urllib.urlopen(urllib.basejoin(librarian_url,
+                    str(attachment['file_alias_id']) + '/' + filename)).read()
+                # Add the attachment to the newly created bug report.
+                bug.addAttachment(
+                    comment=filename,
+                    data=data,
+                    filename=filename,
+                    description=description)
+
+            for subscriber in processed_blob['subscribers']:
+                sub = self.crashdb.launchpad.people[subscriber]
+                if sub:
+                    bug.subscribe(person=sub)
+
+            for submission_key in processed_blob['hwdb_submission_keys']:
+                # XXX 2010-08-04 matsubara bug=628889:
+                #     Can't fetch the submission directly, so let's load it
+                #     from the representation.
+                submission = self.crashdb.launchpad.load(
+                    'https://api.%s/beta/+hwdb/+submission/%s'
+                    % (self.crashdb.get_hostname(), submission_key))
+                bug.linkHWSubmission(submission=submission)
+            return int(bug.id)
 
         def _mark_needs_retrace(self, id):
             '''Mark a report ID as needing retrace.'''
@@ -1401,15 +1455,17 @@
             '''Verify that report ID is marked as regression.'''
 
             bug = self.crashdb.launchpad.bugs[id]
-            self.assert_('regression-retracer' in bug.tags)
+            self.assertTrue('regression-retracer' in bug.tags)
 
         def test_project(self):
             '''reporting crashes against a project instead of a distro'''
 
+            launchpad_instance = os.environ.get('APPORT_LAUNCHPAD_INSTANCE') or 'staging'
             # crash database for langpack-o-matic project (this does not have
             # packages in any distro)
-            crashdb = CrashDatabase(os.environ.get('LP_CREDENTIALS'), '', 
-                {'project': 'langpack-o-matic', 'staging': True})
+            crashdb = CrashDatabase(os.environ.get('LP_CREDENTIALS'), '',
+                {'project': 'langpack-o-matic',
+                 'launchpad_instance': launchpad_instance})
             self.assertEqual(crashdb.distro, None)
 
             # create Python crash report
@@ -1417,21 +1473,22 @@
             r['ExecutablePath'] = '/bin/foo'
             r['Traceback'] = '''Traceback (most recent call last):
   File "/bin/foo", line 67, in fuzz
-    print weird
+    print(weird)
 NameError: global name 'weird' is not defined'''
             r.add_os_info()
             r.add_user_info()
-            self.assertEqual(r.standard_title(), 'foo crashed with NameError in fuzz()')
+            self.assertEqual(r.standard_title(), 
+                    "foo crashed with NameError in fuzz(): global name 'weird' is not defined")
 
             # file it
             handle = crashdb.upload(r)
-            self.assert_(handle)
-            url = crashdb.get_comment_url(r, handle)
-            self.assert_('launchpad.net/langpack-o-matic/+filebug' in url)
+            self.assertTrue(handle)
+            bug_target = self._get_bug_target(crashdb, r)
+            self.assertEqual(bug_target.name, 'langpack-o-matic')
 
-            id = self._fill_bug_form_project(url)
-            self.assert_(id > 0)
-            print >> sys.stderr, '(https://staging.launchpad.net/bugs/%i) ' % id,
+            id = self._file_bug(bug_target, r, handle)
+            self.assertTrue(id > 0)
+            sys.stderr.write('(https://%s/bugs/%i) ' % (self.hostname, id))
 
             # update
             r = crashdb.download(id)
@@ -1454,21 +1511,22 @@
             '''download() of uncommon description formats'''
 
             # only ProblemType/Architecture/DistroRelease in description
-            r = self.crashdb.download(269539)
+            r = self.crashdb.download(self.uncommon_description_bug.id)
             self.assertEqual(r['ProblemType'], 'Package')
             self.assertEqual(r['Architecture'], 'amd64')
-            self.assert_(r['DistroRelease'].startswith('Ubuntu '))
-            self.assert_('DpkgTerminalLog' in r)
+            self.assertTrue(r['DistroRelease'].startswith('Ubuntu '))
 
         def test_escalation(self):
             '''Escalating bugs with more than 10 duplicates'''
 
             assert segv_report, 'you need to run test_1_report_segv() first'
 
-            db = CrashDatabase(os.environ.get('LP_CREDENTIALS'), '', 
-                    {'distro': 'ubuntu', 'staging': True,
-                        'escalation_tag': 'omgkittens',
-                        'escalation_subscription': 'apport-hackers'})
+            launchpad_instance = os.environ.get('APPORT_LAUNCHPAD_INSTANCE') or 'staging'
+            db = CrashDatabase(os.environ.get('LP_CREDENTIALS'), '',
+                    {'distro': 'ubuntu',
+                     'launchpad_instance': launchpad_instance,
+                     'escalation_tag': 'omgkittens',
+                     'escalation_subscription': 'apport-hackers'})
 
             count = 0
             p = db.launchpad.people[db.options['escalation_subscription']].self_link
@@ -1476,38 +1534,36 @@
             try:
                 for b in range(first_dup, first_dup+13):
                     count += 1
-                    print b,
-                    sys.stdout.flush()
+                    sys.stderr.write('%i ' % b)
                     db.close_duplicate(b, segv_report)
                     b = db.launchpad.bugs[segv_report]
                     has_escalation_tag = db.options['escalation_tag'] in b.tags
-                    has_escalation_subsciption = any([s.person_link == p for s in b.subscriptions])
+                    has_escalation_subscription = any([s.person_link == p for s in b.subscriptions])
                     if count <= 10:
-                        self.failIf(has_escalation_tag)
-                        self.failIf(has_escalation_subsciption)
+                        self.assertFalse(has_escalation_tag)
+                        self.assertFalse(has_escalation_subscription)
                     else:
-                        self.assert_(has_escalation_tag)
-                        self.assert_(has_escalation_subsciption)
+                        self.assertTrue(has_escalation_tag)
+                        self.assertTrue(has_escalation_subscription)
             finally:
                 for b in range(first_dup, first_dup+count):
-                    print 'R%i' % b,
-                    sys.stdout.flush()
+                    sys.stderr.write('R%i ' % b)
                     db.close_duplicate(b, None)
-            print
+            sys.stderr.write('\n')
 
         def test_marking_python_task_mangle(self):
             '''source package task fixup for marking interpreter crashes'''
 
             self._mark_needs_dupcheck(python_report)
             unchecked_before = self.crashdb.get_dup_unchecked()
-            self.assert_(python_report in unchecked_before)
+            self.assertTrue(python_report in unchecked_before)
 
             # add an upstream task, and remove the package name from the
             # package task; _mark_dup_checked is supposed to restore the
             # package name
             b = self.crashdb.launchpad.bugs[python_report]
             t = b.bug_tasks[0]
-            t.target = self.crashdb.launchpad.distributions['ubuntu'].getSourcePackage(name='pmount')
+            t.target = self.crashdb.launchpad.distributions['ubuntu'].getSourcePackage(name='bash')
             t.status = 'Invalid'
             t.lp_save()
             b.addTask(target=self.crashdb.launchpad.projects['coreutils'])
@@ -1516,7 +1572,7 @@
             self.crashdb._mark_dup_checked(python_report, self.ref_report)
 
             unchecked_after = self.crashdb.get_dup_unchecked()
-            self.failIf(python_report in unchecked_after)
+            self.assertFalse(python_report in unchecked_after)
             self.assertEqual(unchecked_before,
                     unchecked_after.union(set([python_report])))
 
@@ -1526,12 +1582,12 @@
             self.assertEqual(b.bug_tasks[0].status, 'New')
 
             # package-less distro task should have package name fixed
-            self.assertEqual(b.bug_tasks[1].bug_target_name, 'coreutils (Ubuntu)')
-            self.assertEqual(b.bug_tasks[1].status, 'New')
+            self.assertEqual(b.bug_tasks[2].bug_target_name, 'coreutils (Ubuntu)')
+            self.assertEqual(b.bug_tasks[2].status, 'New')
 
-            # invalid pmount task should be unmodified
-            self.assertEqual(b.bug_tasks[2].bug_target_name, 'pmount (Ubuntu)')
-            self.assertEqual(b.bug_tasks[2].status, 'Invalid')
+            # invalid bash task should be unmodified
+            self.assertEqual(b.bug_tasks[1].bug_target_name, 'bash (Ubuntu)')
+            self.assertEqual(b.bug_tasks[1].status, 'Invalid')
 
             # the invalid task should not confuse get_fixed_version()
             self.assertEqual(self.crashdb.get_fixed_version(python_report),

=== modified file 'apport/crashdb_impl/memory.py'
--- apport/crashdb_impl/memory.py	2010-06-28 14:17:38 +0000
+++ apport/crashdb_impl/memory.py	2011-04-20 23:32:24 +0000
@@ -21,13 +21,13 @@
     
     This is mainly useful for testing and debugging.'''
 
-    def __init__(self, auth_file, bugpattern_baseurl, options):
+    def __init__(self, auth_file, bugpattern_url, options):
         '''Initialize crash database connection.
         
         This class does not support bug patterns and authentication.'''
 
         apport.crashdb.CrashDatabase.__init__(self, auth_file,
-            bugpattern_baseurl, options)
+            bugpattern_url, options)
 
         self.reports = [] # list of dictionaries with keys: report, fixed_version, dup_of, comment
         self.unretraced = set()
@@ -345,12 +345,10 @@
 databases = {
     'testsuite': { 
         'impl': 'memory',
-        'bug_pattern_base': None,
         'dyn_option': get_dyn(),
     },
     get_dyn_name(): {
         'impl': 'memory',
-        'bug_pattern_base': None,
         'whoami': 'dynname',
     }
 }
@@ -360,7 +358,7 @@
         db = apport.crashdb.get_crashdb(None, None, crashdb_conf.name)
         self.assertEqual(db.options['dyn_option'], '4')
         db = apport.crashdb.get_crashdb(None, 'on_thefly', crashdb_conf.name)
-        self.failIf('dyn_opion' in db.options)
+        self.assertFalse('dyn_opion' in db.options)
         self.assertEqual(db.options['whoami'], 'dynname')
 
     #
@@ -428,7 +426,7 @@
         self.assertEqual(self.crashes.reports[1]['comment'], 'muhaha')
         self.assertEqual(self.crashes.download(1)['Package'], 'libfoo1 1.2-4')
         self.assertEqual(self.crashes.download(1)['StacktraceTop'], 'Fresh!')
-        self.failIf(self.crashes.download(1).has_key('FooBar'))
+        self.assertFalse(self.crashes.download(1).has_key('FooBar'))
 
         self.assertRaises(IndexError, self.crashes.update_traces, 5, None)
 
@@ -586,6 +584,33 @@
         self.assertEqual(self.crashes.check_duplicate(5), None)
         self.assertEqual(self.crashes.check_duplicate(6), (5, None))
 
+    def test_check_duplicate_custom_signature(self):
+        '''check_duplicate() with custom DuplicateSignature: field'''
+
+        r = apport.Report()
+        r['SourcePackage'] = 'bash'
+        r['Package'] = 'bash 5'
+        r['DuplicateSignature'] = 'Code42Blue'
+        self.assertEqual(self.crashes.get_comment_url(r, self.crashes.upload(r)),
+            'http://bash.bugs.example.com/5')
+
+        self.crashes.init_duplicate_db(':memory:')
+        self.assertEqual(self.crashes.check_duplicate(5), None)
+
+        self.assertEqual(self.crashes._duplicate_db_dump(), {'Code42Blue': (5, None)})
+
+        # this one has a standard crash_signature
+        self.assertEqual(self.crashes.check_duplicate(0), None)
+        # ... but DuplicateSignature wins
+        self.crashes.download(0)['DuplicateSignature'] = 'Code42Blue'
+        self.assertEqual(self.crashes.check_duplicate(0), (5, None))
+
+        self.crashes.download(1)['DuplicateSignature'] = 'CodeRed'
+        self.assertEqual(self.crashes.check_duplicate(1), None)
+        self.assertEqual(self.crashes._duplicate_db_dump(), 
+                {'Code42Blue': (5, None), 'CodeRed': (1, None), 
+                 self.crashes.download(0).crash_signature(): (0, None)})
+
     def test_check_duplicate_report_arg(self):
         '''check_duplicate() with explicitly passing report'''
 
@@ -639,7 +664,7 @@
         if pid == 0:
             try:
                 self.crashes.duplicate_db_consolidate()
-            except Exception, e:
+            except Exception as e:
                 if 'database is locked' in str(e):
                     os._exit(42)
                 else:
@@ -648,7 +673,7 @@
 
         try:
             self.crashes.duplicate_db_consolidate()
-        except Exception, e:
+        except Exception as e:
             if 'database is locked' in str(e):
                 locked_exceptions += 1
             else:
@@ -656,7 +681,7 @@
 
         # wait on child, examine status
         status = os.wait()[1]
-        self.assert_(os.WIFEXITED(status))
+        self.assertTrue(os.WIFEXITED(status))
         status = os.WEXITSTATUS(status)
         if status == 42:
             locked_exceptions += 1
@@ -702,19 +727,19 @@
         self.crashes.init_duplicate_db(':memory:')
 
         # a fresh and empty db does not need consolidation
-        self.failIf(self.crashes.duplicate_db_needs_consolidation())
+        self.assertFalse(self.crashes.duplicate_db_needs_consolidation())
 
         time.sleep(1.1)
         # for an one-day interval we do not need consolidation
-        self.failIf(self.crashes.duplicate_db_needs_consolidation())
+        self.assertFalse(self.crashes.duplicate_db_needs_consolidation())
         # neither for a ten second one (check timezone offset errors)
-        self.failIf(self.crashes.duplicate_db_needs_consolidation(10))
+        self.assertFalse(self.crashes.duplicate_db_needs_consolidation(10))
         # but for an one second interval
-        self.assert_(self.crashes.duplicate_db_needs_consolidation(1))
+        self.assertTrue(self.crashes.duplicate_db_needs_consolidation(1))
 
         self.crashes.duplicate_db_consolidate()
 
-        self.failIf(self.crashes.duplicate_db_needs_consolidation(1))
+        self.assertFalse(self.crashes.duplicate_db_needs_consolidation(1))
 
     def test_change_master_id(self):
         '''duplicate_db_change_master_id()'''
@@ -762,7 +787,7 @@
             self.assertEqual(self.crashes._duplicate_db_dump(), 
                 {self.crashes.download(0).crash_signature(): (0, '42')})
 
-            self.failIf(self.crashes.duplicate_db_needs_consolidation())
+            self.assertFalse(self.crashes.duplicate_db_needs_consolidation())
             del self.crashes
 
             # damage file
@@ -771,7 +796,7 @@
             f.close()
 
             self.crashes = CrashDatabase(None, None, {})
-            self.assertRaises(SystemError, self.crashes.init_duplicate_db, db)
+            self.assertRaises(StandardError, self.crashes.init_duplicate_db, db)
 
         finally:
             os.unlink(db)

=== modified file 'apport/crashdb_impl/multipartpost_handler.py'
--- apport/crashdb_impl/multipartpost_handler.py	2009-04-11 17:11:06 +0000
+++ apport/crashdb_impl/multipartpost_handler.py	2011-04-20 23:32:24 +0000
@@ -67,7 +67,7 @@
                          v_vars.append((key, value))
             except TypeError:
                 systype, value, traceback = sys.exc_info()
-                raise TypeError, "not a valid non-string sequence or mapping object", traceback
+                raise TypeError("not a valid non-string sequence or mapping object").with_traceback(traceback)
 
             if len(v_files) == 0:
                 data = urllib.urlencode(v_vars, doseq)

=== modified file 'apport/fileutils.py'
--- apport/fileutils.py	2009-12-23 11:01:21 +0000
+++ apport/fileutils.py	2011-04-20 23:32:24 +0000
@@ -9,10 +9,17 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
-import os, glob, subprocess, os.path, ConfigParser
+import os, glob, subprocess, os.path
+
+try:
+    from configparser import ConfigParser, NoOptionError, NoSectionError
+except ImportError:
+    # Python 2
+    from ConfigParser import ConfigParser, NoOptionError, NoSectionError
+
 from problem_report import ProblemReport
 
-from packaging_impl import impl as packaging
+from apport.packaging_impl import impl as packaging
 
 report_dir = os.environ.get('APPORT_REPORT_DIR', '/var/crash')
 
@@ -196,7 +203,7 @@
     elif report.has_key('Package'):
         subject = report['Package'].split(None, 1)[0]
     else:
-        raise ValueError, 'report has neither ExecutablePath nor Package attribute'
+        raise ValueError('report has neither ExecutablePath nor Package attribute')
 
     if not uid:
         uid = os.getuid()
@@ -234,7 +241,7 @@
     interpreted as a boolean.
     '''
     if not get_config.config:
-        get_config.config = ConfigParser.ConfigParser()
+        get_config.config = ConfigParser()
         get_config.config.read(os.path.expanduser(_config_file))
 
     try:
@@ -242,7 +249,7 @@
             return get_config.config.getboolean(section, setting)
         else:
             return get_config.config.get(section, setting)
-    except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+    except (NoOptionError, NoSectionError):
         return default
 
 get_config.config = None
@@ -252,7 +259,10 @@
 #
 
 import unittest, tempfile, os, shutil, sys, time
-from cStringIO import StringIO
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 class _T(unittest.TestCase):
     def setUp(self):
@@ -278,8 +288,8 @@
 
         open(r1, 'w').write('report 1')
         open(r2, 'w').write('report 2')
-        os.chmod(r1, 0600)
-        os.chmod(r2, 0600)
+        os.chmod(r1, 0o600)
+        os.chmod(r2, 0o600)
         if create_inaccessible:
             ri = os.path.join(report_dir, 'inaccessible.crash')
             open(ri, 'w').write('inaccessible')
@@ -321,8 +331,8 @@
         if onedesktop:
             d = find_package_desktopfile(onedesktop)
             self.assertNotEqual(d, None, 'one-desktop package %s' % onedesktop)
-            self.assert_(os.path.exists(d))
-            self.assert_(d.endswith('.desktop'))
+            self.assertTrue(os.path.exists(d))
+            self.assertTrue(d.endswith('.desktop'))
 
     def test_likely_packaged(self):
         '''likely_packaged().'''
@@ -443,9 +453,9 @@
         self.assertRaises(ValueError, make_report_path, pr)
 
         pr['Package'] = 'bash 1'
-        self.assert_(make_report_path(pr).startswith('%s/bash' % report_dir))
+        self.assertTrue(make_report_path(pr).startswith('%s/bash' % report_dir))
         pr['ExecutablePath'] = '/bin/bash';
-        self.assert_(make_report_path(pr).startswith('%s/_bin_bash' % report_dir))
+        self.assertTrue(make_report_path(pr).startswith('%s/_bin_bash' % report_dir))
 
     def test_check_files_md5(self):
         '''check_files_md5().'''

=== modified file 'apport/hookutils.py'
--- apport/hookutils.py	2010-06-24 13:37:14 +0000
+++ apport/hookutils.py	2011-04-20 23:32:24 +0000
@@ -1,6 +1,6 @@
 '''Convenience functions for use in package hooks.'''
 
-# Copyright (C) 2008 - 2010 Canonical Ltd.
+# Copyright (C) 2008 - 2011 Canonical Ltd.
 # Authors: 
 #   Matt Zimmerman <[e-mail]>
 #   Brian Murray <[e-mail]>
@@ -21,6 +21,8 @@
 import string
 import stat
 import base64
+import tempfile
+import shutil
 
 import xml.dom, xml.dom.minidom
 
@@ -51,7 +53,7 @@
     '''
     try:
         return open(path).read().strip()
-    except Exception, e:
+    except Exception as e:
         return 'Error: ' + str(e)
 
 def attach_file(report, path, key=None):
@@ -63,6 +65,9 @@
     if not key:
         key = path_to_key(path)
 
+    # Do not clobber existing keys
+    while report.has_key(key):
+        key += "_"
     report[key] = read_file(path)
 
 def attach_conffiles(report, package, conffiles=None):
@@ -105,10 +110,22 @@
             report[key] = '[deleted]'
 
 def attach_dmesg(report):
-    '''Attach information from the kernel ring buffer (dmesg).'''
+    '''Attach information from the kernel ring buffer (dmesg).
 
-    report['BootDmesg'] = open('/var/log/dmesg').read()
-    report['CurrentDmesg'] = command_output(['sh', '-c', 'dmesg | comm -13 --nocheck-order /var/log/dmesg -'])
+    This won't overwite already existing information.
+    '''
+    try:
+        if not report.get('BootDmesg', '').strip():
+            report['BootDmesg'] = open('/var/log/dmesg').read()
+    except IOError:
+        pass
+    if not report.get('CurrentDmesg', '').strip():
+        dmesg = command_output(['sh', '-c', 'dmesg | comm -13 --nocheck-order /var/log/dmesg -'])
+        # if an initial message was truncated by the ring buffer, skip over it
+        first_newline = dmesg.find('\n[')
+        if first_newline != -1:
+            dmesg = dmesg[first_newline+1:]
+        report['CurrentDmesg'] = dmesg
 
 def attach_dmi(report):
     dmi_dir = '/sys/class/dmi/id'
@@ -148,11 +165,12 @@
 
     attach_file(report, '/proc/interrupts', 'ProcInterrupts')
     attach_file(report, '/proc/cpuinfo', 'ProcCpuinfo')
-    attach_file(report, '/proc/cmdline', 'ProcCmdLine')
+    attach_file(report, '/proc/cmdline', 'ProcKernelCmdLine')
     attach_file(report, '/proc/modules', 'ProcModules')
     attach_file(report, '/var/log/udev', 'UdevLog')
 
-    report['Lspci'] = command_output(['lspci','-vvnn'])
+    if os.path.exists('/sys/bus/pci'):
+        report['Lspci'] = command_output(['lspci','-vvnn'])
     report['Lsusb'] = command_output(['lsusb'])
     report['UdevDb'] = command_output(['udevadm', 'info', '--export-db'])
 
@@ -202,10 +220,11 @@
     report['PciMultimedia'] = pci_devices(PCI_MULTIMEDIA)
 
     cards = []
-    for line in open('/proc/asound/cards'):
-        if ']:' in line:
-            fields = line.lstrip().split()
-            cards.append(int(fields[0]))
+    if os.path.exists('/proc/asound/cards'):
+        for line in open('/proc/asound/cards'):
+            if ']:' in line:
+                fields = line.lstrip().split()
+                cards.append(int(fields[0]))
 
     for card in cards:
         key = 'Card%d.Amixer.info' % card
@@ -260,7 +279,7 @@
     try:
        sp = subprocess.Popen(command, stdout=subprocess.PIPE,
                              stderr=stderr, close_fds=True, env=env)
-    except OSError, e:
+    except OSError as e:
        return 'Error: ' + str(e)
 
     out = sp.communicate(input)[0]
@@ -270,14 +289,7 @@
        return 'Error: command %s failed with exit code %i: %s' % (
            str(command), sp.returncode, out)
 
-def root_command_output(command, input = None, stderr = subprocess.STDOUT):
-    '''Try to execute given command (array) as root and return its stdout. 
-
-    This passes the command through gksu, kdesudo, or sudo, depending on the
-    running desktop environment.
-    
-    In case of failure, a textual error gets returned.
-    '''
+def _root_command_prefix():
     if os.getuid() == 0:
         prefix = []
     elif os.getenv('DISPLAY') and \
@@ -295,7 +307,60 @@
     else:
         prefix = ['sudo']
 
-    return command_output(prefix + command, input, stderr)
+    return prefix
+
+def root_command_output(command, input = None, stderr = subprocess.STDOUT):
+    '''Try to execute given command (array) as root and return its stdout. 
+
+    This passes the command through gksu, kdesudo, or sudo, depending on the
+    running desktop environment.
+    
+    In case of failure, a textual error gets returned.
+    '''
+    assert type(command) == type([]), 'command must be a list'
+    return command_output(_root_command_prefix() + command, input, stderr)
+
+def attach_root_command_outputs(report, command_map):
+    '''Execute multiple commands as root and put their outputs into report.
+
+    command_map is a keyname -> 'shell command' dictionary with the commands to
+    run. They are all run through /bin/sh, so you need to take care of shell
+    escaping yourself. To include stderr output of a command, end it with
+    "2>&1".
+
+    Just like root_command_output() this will use gksu, kdesudo, or sudo for
+    gaining root privileges, depending on the running desktop environment.
+
+    This is preferrable to using root_command_output() multiple times, as that
+    will ask for the password every time.
+    '''
+    workdir = tempfile.mkdtemp()
+    try:
+        # create a shell script with all the commands
+        script_path = os.path.join(workdir, ':script:')
+        script = open(script_path, 'w')
+        for keyname, command in command_map.items():
+            assert hasattr(command, 'strip'), 'command must be a string (shell command)'
+            # use "| cat" here, so that we can end commands with 2>&1
+            # (otherwise it would have the wrong redirection order)
+            script.write('%s | cat > %s\n' % (command, os.path.join(workdir, keyname)))
+        script.close()
+
+        # run script
+        env = os.environ.copy()
+        env['LC_MESSAGES'] = 'C'
+        env['LANGUAGE'] = ''
+        sp = subprocess.Popen(_root_command_prefix() + ['/bin/sh', script_path],
+            close_fds=True, env=env)
+        sp.wait()
+
+        # now read back the individual outputs
+        for keyname in command_map:
+            f = open(os.path.join(workdir, keyname))
+            report[keyname] = f.read()
+            f.close()
+    finally:
+        shutil.rmtree(workdir)
 
 def recent_syslog(pattern):
     '''Extract recent messages from syslog which match a regex.
@@ -303,9 +368,12 @@
     pattern should be a "re" object.
     '''
     lines = ''
-    for line in open('/var/log/syslog'):
-        if pattern.search(line):
-            lines += line
+    try:
+        for line in open('/var/log/syslog'):
+            if pattern.search(line):
+                lines += line
+    except IOError:
+        return []
     return lines
 
 def xsession_errors(pattern):
@@ -440,7 +508,7 @@
 def attach_wifi(report):
     '''Attach wireless (WiFi) network information to report.'''
 
-    report['WifiSyslog'] = recent_syslog(re.compile(r'(NetworkManager|modem-manager|dhclient|kernel):'))
+    report['WifiSyslog'] = recent_syslog(re.compile(r'(NetworkManager|modem-manager|dhclient|kernel)(\[\d+\])?:'))
     report['IwConfig'] = re.sub('Encryption key:(.*)', 'Encryption key: <hidden>', command_output(['iwconfig']))
     report['RfKill'] = command_output(['rfkill', 'list'])
     report['CRDA'] = command_output(['iw', 'reg', 'get'])
@@ -485,20 +553,30 @@
     
     Arguments may be package names or globs, e. g. "foo*"
     '''
-    versions = ''
+    versions = []
     for package_pattern in packages:
         if not package_pattern:
             continue
-        for package in packaging.package_name_glob(package_pattern):
+
+        matching_packages = packaging.package_name_glob(package_pattern)
+
+        if not matching_packages:
+            versions.append((package_pattern, 'N/A'))
+
+        for package in sorted(matching_packages):
             try:
                 version = packaging.get_version(package)
             except ValueError:
                 version = 'N/A'
             if version is None:
                 version = 'N/A'
-            versions += '%s %s\n' % (package, version)
-
-    return versions
+            versions.append((package,version))
+
+    package_width, version_width = \
+        map(max, [map(len, t) for t in zip(*versions)])
+
+    fmt = '%%-%ds %%s' % package_width
+    return '\n'.join([fmt % v for v in versions])
 
 def shared_libraries(path):
     '''Returns a list of strings containing the sonames of shared libraries
@@ -635,7 +713,7 @@
 
 if __name__ == '__main__':
 
-    import unittest, tempfile
+    import unittest
 
     class _T(unittest.TestCase):
         def test_module_license_evaluation(self):
@@ -661,10 +739,10 @@
             #  - fake BAD module
 
             # direct license check
-            self.assert_('GPL' in _get_module_license('isofs'))
+            self.assertTrue('GPL' in _get_module_license('isofs'))
             self.assertEqual(_get_module_license('does-not-exist'), 'invalid')
-            self.assert_('GPL' in _get_module_license(good_ko.name))
-            self.assert_('BAD' in _get_module_license(bad_ko.name))
+            self.assertTrue('GPL' in _get_module_license(good_ko.name))
+            self.assertTrue('BAD' in _get_module_license(bad_ko.name))
 
             # check via nonfree_kernel_modules logic
             f = tempfile.NamedTemporaryFile()
@@ -672,9 +750,44 @@
                     (good_ko.name,bad_ko.name))
             f.flush()
             nonfree = nonfree_kernel_modules(f.name)
-            self.failIf('isofs' in nonfree)
-            self.assert_('does-not-exist' in nonfree)
-            self.failIf(good_ko.name in nonfree)
-            self.assert_(bad_ko.name in nonfree)
+            self.assertFalse('isofs' in nonfree)
+            self.assertTrue('does-not-exist' in nonfree)
+            self.assertFalse(good_ko.name in nonfree)
+            self.assertTrue(bad_ko.name in nonfree)
+
+        def test_attach_dmesg(self):
+            '''attach_dmesg() does not overwrite already existing data'''
+
+            report = {}
+
+            attach_dmesg(report)
+            self.assertTrue(report['BootDmesg'].startswith('['))
+            self.assertTrue(len(report['BootDmesg']) > 500)
+            self.assertTrue(report['CurrentDmesg'].startswith('['))
+
+        def test_dmesg_overwrite(self):
+            '''attach_dmesg() does not overwrite already existing data'''
+
+            report = {'BootDmesg': 'existingboot'}
+
+            attach_dmesg(report)
+            self.assertEqual(report['BootDmesg'][:50], 'existingboot')
+            self.assertTrue(report['CurrentDmesg'].startswith('['))
+            
+            report = {'BootDmesg': 'existingboot', 'CurrentDmesg': 'existingcurrent' }
+
+            attach_dmesg(report)
+            self.assertEqual(report['BootDmesg'], 'existingboot')
+            self.assertEqual(report['CurrentDmesg'], 'existingcurrent')
+
+        def test_no_crashes(self):
+            '''functions do not crash (very shallow'''
+
+            report = {}
+            attach_hardware(report)
+            attach_alsa(report)
+            attach_network(report)
+            attach_wifi(report)
+            attach_printing(report)
 
     unittest.main()

=== modified file 'apport/packaging.py'
--- apport/packaging.py	2009-12-23 10:55:52 +0000
+++ apport/packaging.py	2011-04-20 23:32:24 +0000
@@ -15,26 +15,26 @@
         
         Throw ValueError if package does not exist.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_available_version(self, package):
         '''Return the latest available version of a package.
         
         Throw ValueError if package does not exist.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_dependencies(self, package):
         '''Return a list of packages a package depends on.'''
 
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_source(self, package):
         '''Return the source package name for a package.
         
         Throw ValueError if package does not exist.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def is_distro_package(self, package):
         '''Check package origin.
@@ -44,7 +44,7 @@
 
         Throw ValueError if package does not exist.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_architecture(self, package):
         '''Return the architecture of a package.
@@ -52,19 +52,19 @@
         This might differ on multiarch architectures (e. g.  an i386 Firefox
         package on a x86_64 system)
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_files(self, package):
         '''Return list of files shipped by a package.
 
         Throw ValueError if package does not exist.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_modified_files(self, package):
         '''Return list of all modified files of a package.'''
 
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_file_package(self, file, uninstalled=False, map_cachedir=None):
         '''Return the package a file belongs to.
@@ -77,14 +77,14 @@
         an existing directory which will be used to permanently store the
         downloaded maps. If it is not set, a temporary directory will be used.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_system_architecture(self):
         '''Return the architecture of the system.
         
         This should use the notation of the particular distribution.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def set_mirror(self, url):
         '''Explicitly set a distribution mirror URL.
@@ -95,7 +95,7 @@
         By default, the mirror will be read from the system configuration
         files.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_source_tree(self, srcpackage, dir, version=None):
         '''Download a source package and unpack it into dir..
@@ -112,14 +112,14 @@
         (which might be a subdirectory of dir). Return None if the source is
         not available.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def compare_versions(self, ver1, ver2):
         '''Compare two package versions.
 
         Return -1 for ver < ver2, 0 for ver1 == ver2, and 1 for ver1 > ver2.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def enabled(self):
         '''Return whether Apport should generate crash reports.
@@ -132,14 +132,14 @@
         Implementations should parse the configuration file which controls
         Apport (such as /etc/default/apport in Debian/Ubuntu).
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def get_kernel_package(self):
         '''Return the actual Linux kernel package name.
 
         This is used when the user reports a bug against the "linux" package.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def install_retracing_packages(self, report, verbosity=0,
             unpack_only=False, no_pkg=False, extra_packages=[]):
@@ -157,7 +157,7 @@
         
         Return a tuple (list of installed packages, string with outdated packages).
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def remove_packages(self, packages, verbosity=0):
         '''Remove packages.
@@ -165,11 +165,11 @@
         This is called after install_retracing_packages() to clean up again
         afterwards. packages is a list of package names.
         '''
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
     def package_name_glob(self, glob):
         '''Return known package names which match given glob.'''
 
-        raise NotImplementedError, 'this method must be implemented by a concrete subclass'
+        raise NotImplementedError('this method must be implemented by a concrete subclass')
 
-import packaging_impl
+import apport.packaging_impl

=== modified file 'apport/report.py'
--- apport/report.py	2010-06-16 13:50:47 +0000
+++ apport/report.py	2011-04-20 23:32:24 +0000
@@ -16,8 +16,9 @@
 from xml.parsers.expat import ExpatError
 
 from problem_report import ProblemReport
-import fileutils
-from packaging_impl import impl as packaging
+import apport
+import apport.fileutils
+from apport.packaging_impl import impl as packaging
 
 _data_dir = os.environ.get('APPORT_DATA_DIR','/usr/share/apport')
 _hook_dir = '%s/package-hooks/' % (_data_dir)
@@ -56,7 +57,7 @@
     '''
     try:
         return open(path).read().strip()
-    except (OSError, IOError), e:
+    except (OSError, IOError) as e:
         return 'Error: ' + str(e)
 
 def _read_maps(pid):
@@ -67,8 +68,8 @@
     '''
     maps = 'Error: unable to read /proc maps file'
     try:
-        maps = file('/proc/%d/maps' % pid).read().strip()
-    except (OSError,IOError), e:
+        maps = open('/proc/%d/maps' % pid).read().strip()
+    except (OSError,IOError) as e:
         return 'Error: ' + str(e)
     return maps
 
@@ -84,8 +85,8 @@
     if sp.returncode == 0:
         return out
     else:
-       raise OSError, 'Error: command %s failed with exit code %i: %s' % (
-           str(command), sp.returncode, err)
+       raise OSError('Error: command %s failed with exit code %i: %s' % (
+           str(command), sp.returncode, err))
 
 def _check_bug_pattern(report, pattern):
     '''Check if given report matches the given bug pattern XML DOM node.
@@ -114,6 +115,19 @@
 
     return pattern.attributes['url'].nodeValue.encode('UTF-8')
 
+def _check_bug_patterns(report, patterns):
+    try:
+        dom = xml.dom.minidom.parseString(patterns)
+    except ExpatError:
+        return None
+
+    for pattern in dom.getElementsByTagName('pattern'):
+        url = _check_bug_pattern(report, pattern)
+        if url:
+            return url
+
+    return None
+
 def _dom_remove_space(node):
     '''Recursively remove whitespace from given XML DOM node.'''
 
@@ -177,7 +191,7 @@
                 self['ProblemType'] == 'KernelCrash'):
                 package = self['Package']
             else:
-                package = fileutils.find_file_package(self['ExecutablePath'])
+                package = apport.fileutils.find_file_package(self['ExecutablePath'])
             if not package:
                 return
 
@@ -333,9 +347,9 @@
         self['ProcMaps'] = _read_maps(int(pid))
         try:
             self['ExecutablePath'] = os.readlink('/proc/' + pid + '/exe')
-        except OSError, e:
+        except OSError as e:
             if e.errno == errno.ENOENT:
-                raise ValueError, 'invalid process'
+                raise ValueError('invalid process')
             else:
                 raise
         for p in ('rofs', 'rwfs', 'squashmnt', 'persistmnt'):
@@ -539,12 +553,12 @@
         are generally not useful for triaging and duplicate detection.
         '''
         unwind_functions = set(['g_logv', 'g_log', 'IA__g_log', 'IA__g_logv',
-            'g_assert_warning', 'IA__g_assert_warning'])
+            'g_assert_warning', 'IA__g_assert_warning', '__GI_abort'])
         toptrace = [''] * 5
         depth = 0
         unwound = False
         unwinding = False
-        bt_fn_re = re.compile('^#(\d+)\s+(?:0x(?:\w+)\s+in\s+(.*)|(<signal handler called>)\s*)$')
+        bt_fn_re = re.compile('^#(\d+)\s+(?:0x(?:\w+)\s+in\s+\*?(.*)|(<signal handler called>)\s*)$')
         bt_fn_noaddr_re = re.compile('^#(\d+)\s+(?:(.*)|(<signal handler called>)\s*)$')
 
         for line in self['Stacktrace'].splitlines():
@@ -592,14 +606,17 @@
                 execfile(hook, symb)
                 try:
                     symb['add_info'](self, ui)
-                except TypeError:
-                    # older versions of apport did not pass UI, and hooks that
-                    # do not require it don't need to take it
-                    symb['add_info'](self)
+                except TypeError as e:
+                    if e.message.startswith('add_info()'):
+                        # older versions of apport did not pass UI, and hooks that
+                        # do not require it don't need to take it
+                        symb['add_info'](self)
+                    else:
+                        raise
             except StopIteration:
                 return True
             except:
-                print >> sys.stderr, 'hook %s crashed:' % hook
+                apport.error('hook %s crashed:', hook)
                 traceback.print_exc()
                 pass
 
@@ -613,14 +630,17 @@
                     execfile(hook, symb)
                     try:
                         symb['add_info'](self, ui)
-                    except TypeError:
-                        # older versions of apport did not pass UI, and hooks that
-                        # do not require it don't need to take it
-                        symb['add_info'](self)
+                    except TypeError as e:
+                        if e.message.startswith('add_info()'):
+                            # older versions of apport did not pass UI, and hooks that
+                            # do not require it don't need to take it
+                            symb['add_info'](self)
+                        else:
+                            raise
                 except StopIteration:
                     return True
                 except:
-                    print >> sys.stderr, 'hook %s crashed:' % hook
+                    apport.error('hook %s crashed:', hook)
                     traceback.print_exc()
                     pass
 
@@ -634,25 +654,28 @@
                     execfile(hook, symb)
                     try:
                         symb['add_info'](self, ui)
-                    except TypeError:
-                        # older versions of apport did not pass UI, and hooks that
-                        # do not require it don't need to take it
-                        symb['add_info'](self)
+                    except TypeError as e:
+                        if e.message.startswith('add_info()'):
+                            # older versions of apport did not pass UI, and hooks that
+                            # do not require it don't need to take it
+                            symb['add_info'](self)
+                        else:
+                            raise
                 except StopIteration:
                     return True
                 except:
-                    print >> sys.stderr, 'hook %s crashed:' % hook
+                    apport.error('hook %s crashed:', hook)
                     traceback.print_exc()
                     pass
 
         return False
 
-    def search_bug_patterns(self, baseurl):
-        '''Check bug patterns at baseurl/packagename.xml. 
+    def search_bug_patterns(self, url):
+        '''Check bug patterns loaded from the specified url. 
         
         Return bug URL on match, or None otherwise.
 
-        The pattern file must be valid XML and has the following syntax:
+        The url must refer to a valid XML document with the following syntax:
         root element := <patterns>
         patterns := <pattern url="http://bug.url"> *
         pattern := <re key="report_key">regular expression*</re> +
@@ -664,39 +687,27 @@
                 <re key="Foo">ba.*r</re>
             </pattern>
             <pattern url="http://bugtracker.net/bugs/2">
+                <re key="Package">^\S* 1-2$</re> <!-- test for a particular version -->
                 <re key="Foo">write_(hello|goodbye)</re>
-                <re key="Package">^\S* 1-2$</re> <!-- test for a particular version -->
             </pattern>
         </patterns>
         '''
         # some distros might not want to support these
-        if not baseurl:
+        if not url:
             return
 
-        assert self.has_key('Package')
-        package = self['Package'].split()[0]
         try:
-            patterns = urllib.urlopen('%s/%s.xml' % (baseurl, package)).read()
-            assert '<title>404 Not Found' not in patterns
+            patterns = urllib.urlopen(url).read()
         except:
-            # try if there is one for the source package
-            if self.has_key('SourcePackage'):
-                try:
-                    patterns = urllib.urlopen('%s/%s.xml' % (baseurl, self['SourcePackage'])).read()
-                except:
-                    return None
-            else:
-                return None
-
-        try:
-            dom = xml.dom.minidom.parseString(patterns)
-        except ExpatError:
-            return None
-
-        for pattern in dom.getElementsByTagName('pattern'):
-            m = _check_bug_pattern(self, pattern)
-            if m:
-                return m
+            # doesn't exist or failed to load
+            return
+
+        if '<title>404 Not Found' in patterns:
+            return
+
+        url = _check_bug_patterns(self, patterns)
+        if url:
+            return url
 
         return None
 
@@ -714,8 +725,8 @@
         else:
             try:
                 dom = xml.dom.minidom.parse(ifpath)
-            except ExpatError, e:
-                raise ValueError, '%s has invalid format: %s' % (_ignore_file, str(e))
+            except ExpatError as e:
+                raise ValueError('%s has invalid format: %s' % (_ignore_file, str(e)))
 
         # remove whitespace so that writing back the XML does not accumulate
         # whitespace
@@ -880,22 +891,46 @@
                     os.path.basename(self['ExecutablePath']),
                     trace[0])
 
-            trace_re = re.compile('^\s*File.* in (.+)$')
+            trace_re = re.compile('^\s*File\s*"(\S+)".* in (.+)$')
             i = len(trace)-1
             function = 'unknown'
             while i >= 0:
                 m = trace_re.match(trace[i])
                 if m:
-                    function = m.group(1)
+                    module_path = m.group(1)
+                    function = m.group(2)
                     break
                 i -= 1
 
-            return '%s crashed with %s in %s()' % (
-                os.path.basename(self['ExecutablePath']),
-                trace[-1].split(':')[0],
-                function
+            path = os.path.basename(self['ExecutablePath'])
+            last_line = trace[-1]
+            exception = last_line.split(':')[0]
+            m = re.match('^%s: (.+)$' % exception, last_line)
+            if m:
+                message = m.group(1)
+            else:
+                message = None
+
+            if function == '<module>':
+                if module_path == self['ExecutablePath']:
+                    context = '__main__'
+                else:
+                    # Maybe use os.path.basename?
+                    context = module_path
+            else:
+                context = '%s()' % function
+
+            title = '%s crashed with %s in %s' % (
+                path,
+                exception,
+                context
             )
 
+            if message:
+                title += ': %s' % message
+
+            return title
+
         # package problem
         if self.get('ProblemType') == 'Package' and \
             self.has_key('Package'):
@@ -991,7 +1026,11 @@
             sig = '%s:%s' % (self['ExecutablePath'], self['Signal'])
             bt_fn_re = re.compile('^(?:([\w:~]+).*|(<signal handler called>)\s*)$')
 
-            for line in self['StacktraceTop'].splitlines():
+            lines = self['StacktraceTop'].splitlines()
+            if len(lines) < 2:
+                return None
+
+            for line in lines:
                 m = bt_fn_re.match(line)
                 if m:
                     sig += ':' + (m.group(1) or m.group(2))
@@ -1067,7 +1106,10 @@
 #
 
 import unittest, shutil, signal, time
-from cStringIO import StringIO
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 class _T(unittest.TestCase):
     def test_add_package_info(self):
@@ -1082,7 +1124,7 @@
         pr.add_package_info('bash')
         self.assertEqual(pr['Package'], 'bash ' + bashversion.strip())
         self.assertEqual(pr['SourcePackage'], 'bash')
-        self.assert_('libc' in pr['Dependencies'])
+        self.assertTrue('libc' in pr['Dependencies'])
 
         # test without specifying a package, but with ExecutablePath
         pr = Report()
@@ -1091,36 +1133,36 @@
         pr.add_package_info()
         self.assertEqual(pr['Package'], 'bash ' + bashversion.strip())
         self.assertEqual(pr['SourcePackage'], 'bash')
-        self.assert_('libc' in pr['Dependencies'])
+        self.assertTrue('libc' in pr['Dependencies'])
         # check for stray empty lines
-        self.assert_('\n\n' not in pr['Dependencies'])
-        self.assert_(pr.has_key('PackageArchitecture'))
+        self.assertTrue('\n\n' not in pr['Dependencies'])
+        self.assertTrue(pr.has_key('PackageArchitecture'))
 
         pr = Report()
         pr['ExecutablePath'] = '/nonexisting'
         pr.add_package_info()
-        self.assert_(not pr.has_key('Package'))
+        self.assertTrue(not pr.has_key('Package'))
 
     def test_add_os_info(self):
         '''add_os_info().'''
 
         pr = Report()
         pr.add_os_info()
-        self.assert_(pr['Uname'].startswith('Linux'))
-        self.assert_(type(pr['DistroRelease']) == type(''))
-        self.assert_(pr['Architecture'])
+        self.assertTrue(pr['Uname'].startswith('Linux'))
+        self.assertTrue(type(pr['DistroRelease']) == type(''))
+        self.assertTrue(pr['Architecture'])
 
     def test_add_user_info(self):
         '''add_user_info().'''
 
         pr = Report()
         pr.add_user_info()
-        self.assert_(pr.has_key('UserGroups'))
+        self.assertTrue(pr.has_key('UserGroups'))
 
         # double-check that user group names are removed
         for g in pr['UserGroups'].split():
-            self.assert_(grp.getgrnam(g).gr_gid < 1000)
-        self.assert_(grp.getgrgid(os.getgid()).gr_name not in pr['UserGroups'])
+            self.assertTrue(grp.getgrnam(g).gr_gid < 1000)
+        self.assertTrue(grp.getgrgid(os.getgid()).gr_name not in pr['UserGroups'])
 
     def test_add_proc_info(self):
         '''add_proc_info().'''
@@ -1135,26 +1177,26 @@
         self.assertEqual(pr.pid, None)
         pr.add_proc_info()
         self.assertEqual(pr.pid, os.getpid())
-        self.assert_(set(['ProcEnviron', 'ProcMaps', 'ProcCmdline',
+        self.assertTrue(set(['ProcEnviron', 'ProcMaps', 'ProcCmdline',
             'ProcMaps']).issubset(set(pr.keys())), 'report has required fields')
-        self.assert_('LANG='+os.environ['LANG'] in pr['ProcEnviron'])
-        self.assert_('USER' not in pr['ProcEnviron'])
-        self.assert_('PWD' not in pr['ProcEnviron'])
+        self.assertTrue('LANG='+os.environ['LANG'] in pr['ProcEnviron'])
+        self.assertTrue('USER' not in pr['ProcEnviron'])
+        self.assertTrue('PWD' not in pr['ProcEnviron'])
 
         # check with one additional safe environment variable
         pr = Report()
         pr.add_proc_info(extraenv=['PWD'])
-        self.assert_('USER' not in pr['ProcEnviron'])
-        self.assert_('PWD='+os.environ['PWD'] in pr['ProcEnviron'])
+        self.assertTrue('USER' not in pr['ProcEnviron'])
+        self.assertTrue('PWD='+os.environ['PWD'] in pr['ProcEnviron'])
 
         # check process from other user
         assert os.getuid() != 0, 'please do not run this test as root for this check.'
         pr = Report()
         self.assertRaises(OSError, pr.add_proc_info, 1) # EPERM for init process
         self.assertEqual(pr.pid, 1)
-        self.assert_('init' in pr['ProcStatus'], pr['ProcStatus'])
-        self.assert_(pr['ProcEnviron'].startswith('Error:'), pr['ProcEnviron'])
-        self.assert_(not pr.has_key('InterpreterPath'))
+        self.assertTrue('init' in pr['ProcStatus'], pr['ProcStatus'])
+        self.assertTrue(pr['ProcEnviron'].startswith('Error:'), pr['ProcEnviron'])
+        self.assertTrue(not pr.has_key('InterpreterPath'))
 
         # check escaping of ProcCmdline
         p = subprocess.Popen(['cat', '/foo bar', '\\h', '\\ \\', '-'],
@@ -1170,7 +1212,7 @@
         p.communicate('\n')
         self.assertEqual(pr['ProcCmdline'], 'cat /foo\ bar \\\\h \\\\\\ \\\\ -')
         self.assertEqual(pr['ExecutablePath'], '/bin/cat')
-        self.assert_(not pr.has_key('InterpreterPath'))
+        self.assertTrue(not pr.has_key('InterpreterPath'))
         self.assertTrue('/bin/cat' in pr['ProcMaps'])
         self.assertTrue('[stack]' in pr['ProcMaps'])
 
@@ -1186,7 +1228,7 @@
         pr.pid = p.pid
         pr.add_proc_info()
         p.communicate('exit\n')
-        self.failIf(pr.has_key('InterpreterPath'), pr.get('InterpreterPath'))
+        self.assertFalse(pr.has_key('InterpreterPath'), pr.get('InterpreterPath'))
         self.assertEqual(pr['ExecutablePath'], os.path.realpath('/bin/sh'))
 
         # check correct handling of interpreted executables: shell
@@ -1199,7 +1241,7 @@
         pr = Report()
         pr.add_proc_info(pid=p.pid)
         p.communicate('\n')
-        self.assert_(pr['ExecutablePath'].endswith('bin/zgrep'))
+        self.assertTrue(pr['ExecutablePath'].endswith('bin/zgrep'))
         self.assertEqual(pr['InterpreterPath'],
             os.path.realpath(open(pr['ExecutablePath']).readline().strip()[2:]))
         self.assertTrue('[stack]' in pr['ProcMaps'])
@@ -1211,7 +1253,7 @@
 sys.stdin.readline()
 ''')
         os.close(fd)
-        os.chmod(testscript, 0755)
+        os.chmod(testscript, 0o755)
         p = subprocess.Popen([testscript], stdin=subprocess.PIPE,
             stderr=subprocess.PIPE, close_fds=True)
         assert p.pid
@@ -1223,7 +1265,7 @@
         p.communicate('\n')
         os.unlink(testscript)
         self.assertEqual(pr['ExecutablePath'], testscript)
-        self.assert_('python' in pr['InterpreterPath'])
+        self.assertTrue('python' in pr['InterpreterPath'])
         self.assertTrue('python' in pr['ProcMaps'])
         self.assertTrue('[stack]' in pr['ProcMaps'])
 
@@ -1240,7 +1282,7 @@
         r = Report()
         r.add_proc_environ(pid=p.pid)
         p.communicate('')
-        self.failIf('PATH' in r['ProcEnviron'], 
+        self.assertFalse('PATH' in r['ProcEnviron'], 
             'system default $PATH should be filtered out')
 
         # no user paths
@@ -1250,7 +1292,7 @@
         r = Report()
         r.add_proc_environ(pid=p.pid)
         p.communicate('')
-        self.assert_('PATH=(custom, no user)' in r['ProcEnviron'], 
+        self.assertTrue('PATH=(custom, no user)' in r['ProcEnviron'], 
             'PATH is customized without user paths')
 
         # user paths
@@ -1260,7 +1302,7 @@
         r = Report()
         r.add_proc_environ(pid=p.pid)
         p.communicate('')
-        self.assert_('PATH=(custom, user)' in r['ProcEnviron'], 
+        self.assertTrue('PATH=(custom, user)' in r['ProcEnviron'], 
             'PATH is customized with user paths')
 
     def test_check_interpreted(self):
@@ -1274,7 +1316,7 @@
         pr['ProcCmdline'] = 'gedit\0/' + f.name
         pr._check_interpreted()
         self.assertEqual(pr['ExecutablePath'], '/usr/bin/gedit')
-        self.failIf(pr.has_key('InterpreterPath'))
+        self.assertFalse(pr.has_key('InterpreterPath'))
         f.close()
 
         # bogus argv[0]
@@ -1284,7 +1326,7 @@
         pr['ProcCmdline'] = 'nonexisting\0/foo'
         pr._check_interpreted()
         self.assertEqual(pr['ExecutablePath'], '/bin/dash')
-        self.failIf(pr.has_key('InterpreterPath'))
+        self.assertFalse(pr.has_key('InterpreterPath'))
 
         # standard sh script
         pr = Report()
@@ -1331,7 +1373,7 @@
         pr['ProcCmdline'] = 'python\0/etc/shadow'
         pr._check_interpreted()
         self.assertEqual(pr['ExecutablePath'], '/usr/bin/python')
-        self.failIf(pr.has_key('InterpreterPath'))
+        self.assertFalse(pr.has_key('InterpreterPath'))
 
         # succeed on files we should have access to when name!=argv[0]
         pr = Report()
@@ -1349,7 +1391,7 @@
         pr['ProcCmdline'] = '../etc/shadow'
         pr._check_interpreted()
         self.assertEqual(pr['ExecutablePath'], '/usr/bin/python')
-        self.failIf(pr.has_key('InterpreterPath'))
+        self.assertFalse(pr.has_key('InterpreterPath'))
 
         # succeed on files we should have access to when name==argv[0]
         pr = Report()
@@ -1367,7 +1409,7 @@
         pr['ProcCmdline'] = 'python'
         pr._check_interpreted()
         self.assertEqual(pr['ExecutablePath'], '/usr/bin/python')
-        self.failIf(pr.has_key('InterpreterPath'))
+        self.assertFalse(pr.has_key('InterpreterPath'))
 
         # python script (abuse /bin/bash since it must exist)
         pr = Report()
@@ -1435,21 +1477,21 @@
         return pr
 
     def _validate_gdb_fields(self,pr):
-        self.assert_(pr.has_key('Stacktrace'))
-        self.assert_(pr.has_key('ThreadStacktrace'))
-        self.assert_(pr.has_key('StacktraceTop'))
-        self.assert_(pr.has_key('Registers'))
-        self.assert_(pr.has_key('Disassembly'))
-        self.assert_('(no debugging symbols found)' not in pr['Stacktrace'])
-        self.assert_('Core was generated by' not in pr['Stacktrace'], pr['Stacktrace'])
-        self.assert_(not re.match(r'(?s)(^|.*\n)#0  [^\n]+\n#0  ',
+        self.assertTrue(pr.has_key('Stacktrace'))
+        self.assertTrue(pr.has_key('ThreadStacktrace'))
+        self.assertTrue(pr.has_key('StacktraceTop'))
+        self.assertTrue(pr.has_key('Registers'))
+        self.assertTrue(pr.has_key('Disassembly'))
+        self.assertTrue('(no debugging symbols found)' not in pr['Stacktrace'])
+        self.assertTrue('Core was generated by' not in pr['Stacktrace'], pr['Stacktrace'])
+        self.assertTrue(not re.match(r'(?s)(^|.*\n)#0  [^\n]+\n#0  ',
                                   pr['Stacktrace']))
-        self.assert_('#0  0x' in pr['Stacktrace'])
-        self.assert_('#1  0x' in pr['Stacktrace'])
-        self.assert_('#0  0x' in pr['ThreadStacktrace'])
-        self.assert_('#1  0x' in pr['ThreadStacktrace'])
-        self.assert_('Thread 1 (' in pr['ThreadStacktrace'])
-        self.assert_(len(pr['StacktraceTop'].splitlines()) <= 5)
+        self.assertTrue('#0  0x' in pr['Stacktrace'])
+        self.assertTrue('#1  0x' in pr['Stacktrace'])
+        self.assertTrue('#0  0x' in pr['ThreadStacktrace'])
+        self.assertTrue('#1  0x' in pr['ThreadStacktrace'])
+        self.assertTrue('Thread 1 (' in pr['ThreadStacktrace'])
+        self.assertTrue(len(pr['StacktraceTop'].splitlines()) <= 5)
 
     def test_add_gdb_info(self):
         '''add_gdb_info() with core dump file reference.'''
@@ -1462,7 +1504,7 @@
         pr = self._generate_sigsegv_report()
         self._validate_gdb_fields(pr)
         self.assertEqual(pr['StacktraceTop'], 'f (x=42) at crash.c:3\nmain () at crash.c:6', pr['StacktraceTop'])
-        self.failIf ('AssertionMessage' in pr)
+        self.assertFalse ('AssertionMessage' in pr)
 
         # crash where gdb generates output on stderr
         pr = self._generate_sigsegv_report(code='''
@@ -1473,8 +1515,8 @@
 }
 ''')
         self._validate_gdb_fields(pr)
-        self.assert_('Cannot access memory at address 0x0' in pr['Disassembly'], pr['Disassembly'])
-        self.failIf ('AssertionMessage' in pr)
+        self.assertTrue('Cannot access memory at address 0x0' in pr['Disassembly'], pr['Disassembly'])
+        self.assertFalse ('AssertionMessage' in pr)
 
     def test_add_gdb_info_load(self):
         '''add_gdb_info() with inline core dump.'''
@@ -1499,22 +1541,22 @@
         pr.load(open(rep.name))
         pr['Signal'] = '1'
         pr.add_hooks_info('fake_ui')
-        self.assert_('SegvAnalysis' not in pr.keys())
+        self.assertTrue('SegvAnalysis' not in pr.keys())
 
         pr = Report()
         pr.load(open(rep.name))
         pr.add_hooks_info('fake_ui')
-        self.assert_('Skipped: missing required field "Architecture"' in pr['SegvAnalysis'],
+        self.assertTrue('Skipped: missing required field "Architecture"' in pr['SegvAnalysis'],
                      pr['SegvAnalysis'])
 
         pr.add_os_info()
         pr.add_hooks_info('fake_ui')
-        self.assert_('Skipped: missing required field "ProcMaps"' in pr['SegvAnalysis'],
+        self.assertTrue('Skipped: missing required field "ProcMaps"' in pr['SegvAnalysis'],
                      pr['SegvAnalysis'])
 
         pr.add_proc_info()
         pr.add_hooks_info('fake_ui')
-        self.assert_('not located in a known VMA region' in pr['SegvAnalysis'],
+        self.assertTrue('not located in a known VMA region' in pr['SegvAnalysis'],
                      pr['SegvAnalysis'])
 
     def test_add_gdb_info_script(self):
@@ -1532,7 +1574,7 @@
 ulimit -c unlimited
 kill -SEGV $$
 ''')
-            os.chmod(script, 0755)
+            os.chmod(script, 0o755)
 
             # call script and verify that it gives us a proper ELF core dump
             assert subprocess.call([script]) != 0
@@ -1549,7 +1591,7 @@
             os.unlink(script)
 
         self._validate_gdb_fields(pr)
-        self.assert_('libc.so' in pr['Stacktrace'] or 'in execute_command' in pr['Stacktrace'])
+        self.assertTrue('libc.so' in pr['Stacktrace'] or 'in execute_command' in pr['Stacktrace'])
 
     def test_add_gdb_info_abort(self):
         '''add_gdb_info() with SIGABRT/assert()
@@ -1572,7 +1614,7 @@
 ulimit -c unlimited
 $0.bin 2>/dev/null
 ''')
-            os.chmod(script, 0755)
+            os.chmod(script, 0o755)
 
             # call script and verify that it gives us a proper ELF core dump
             assert subprocess.call([script]) != 0
@@ -1589,11 +1631,11 @@
             os.unlink('core')
 
         self._validate_gdb_fields(pr)
-        self.assert_("<stdin>:2: main: Assertion `1 < 0' failed." in
+        self.assertTrue("<stdin>:2: main: Assertion `1 < 0' failed." in
                 pr['AssertionMessage'], pr['AssertionMessage'])
-        self.failIf(pr['AssertionMessage'].startswith('$'), pr['AssertionMessage'])
-        self.failIf('= 0x' in pr['AssertionMessage'], pr['AssertionMessage'])
-        self.failIf(pr['AssertionMessage'].endswith('\\n'), pr['AssertionMessage'])
+        self.assertFalse(pr['AssertionMessage'].startswith('$'), pr['AssertionMessage'])
+        self.assertFalse('= 0x' in pr['AssertionMessage'], pr['AssertionMessage'])
+        self.assertFalse(pr['AssertionMessage'].endswith('\\n'), pr['AssertionMessage'])
 
         # abort with internal error
         (fd, script) = tempfile.mkstemp()
@@ -1614,7 +1656,7 @@
 ulimit -c unlimited
 LIBC_FATAL_STDERR_=1 $0.bin aaaaaaaaaaaaaaaa 2>/dev/null
 ''')
-            os.chmod(script, 0755)
+            os.chmod(script, 0o755)
 
             # call script and verify that it gives us a proper ELF core dump
             assert subprocess.call([script]) != 0
@@ -1631,11 +1673,11 @@
             os.unlink('core')
 
         self._validate_gdb_fields(pr)
-        self.assert_("** buffer overflow detected ***: %s.bin terminated" % (script) in
+        self.assertTrue("** buffer overflow detected ***: %s.bin terminated" % (script) in
                 pr['AssertionMessage'], pr['AssertionMessage'])
-        self.failIf(pr['AssertionMessage'].startswith('$'), pr['AssertionMessage'])
-        self.failIf('= 0x' in pr['AssertionMessage'], pr['AssertionMessage'])
-        self.failIf(pr['AssertionMessage'].endswith('\\n'), pr['AssertionMessage'])
+        self.assertFalse(pr['AssertionMessage'].startswith('$'), pr['AssertionMessage'])
+        self.assertFalse('= 0x' in pr['AssertionMessage'], pr['AssertionMessage'])
+        self.assertFalse(pr['AssertionMessage'].endswith('\\n'), pr['AssertionMessage'])
 
         # abort without assertion
         (fd, script) = tempfile.mkstemp()
@@ -1652,7 +1694,7 @@
 ulimit -c unlimited
 $0.bin 2>/dev/null
 ''')
-            os.chmod(script, 0755)
+            os.chmod(script, 0o755)
 
             # call script and verify that it gives us a proper ELF core dump
             assert subprocess.call([script]) != 0
@@ -1669,97 +1711,103 @@
             os.unlink('core')
 
         self._validate_gdb_fields(pr)
-        self.failIf ('AssertionMessage' in pr, pr.get('AssertionMessage'))
+        self.assertFalse ('AssertionMessage' in pr, pr.get('AssertionMessage'))
 
     def test_search_bug_patterns(self):
         '''search_bug_patterns().'''
 
-        pdir = None
-        try:
-            pdir = tempfile.mkdtemp()
-
-            # create some test patterns
-            open(os.path.join(pdir, 'bash.xml'), 'w').write('''<?xml version="1.0"?>
+        patterns = tempfile.NamedTemporaryFile(prefix='apport-')
+        # create some test patterns
+        patterns.write('''<?xml version="1.0"?>
 <patterns>
     <pattern url="http://bugtracker.net/bugs/1">
+        <re key="Package">^bash </re>
         <re key="Foo">ba.*r</re>
     </pattern>
     <pattern url="http://bugtracker.net/bugs/2">
+        <re key="Package">^bash 1-2$</re>
         <re key="Foo">write_(hello|goodbye)</re>
-        <re key="Package">^\S* 1-2$</re>
     </pattern>
-</patterns>''')
-
-            open(os.path.join(pdir, 'coreutils.xml'), 'w').write('''<?xml version="1.0"?>
-<patterns>
     <pattern url="http://bugtracker.net/bugs/3">
+        <re key="Package">^coreutils </re>
         <re key="Bar">^1$</re>
     </pattern>
     <pattern url="http://bugtracker.net/bugs/4">
+        <re key="Package">^coreutils </re>
         <re key="Bar">*</re> <!-- invalid RE -->
     </pattern>
-</patterns>''')
-
-            # invalid XML
-            open(os.path.join(pdir, 'invalid.xml'), 'w').write('''<?xml version="1.0"?>
-</patterns>''')
-
-            # create some reports
-            r_bash = Report()
-            r_bash['Package'] = 'bash 1-2'
-            r_bash['Foo'] = 'bazaar'
-
-            r_coreutils = Report()
-            r_coreutils['Package'] = 'coreutils 1'
-            r_coreutils['Bar'] = '1'
-
-            r_invalid = Report()
-            r_invalid['Package'] = 'invalid 1'
-
-            # positive match cases
-            self.assertEqual(r_bash.search_bug_patterns(pdir), 'http://bugtracker.net/bugs/1')
-            r_bash['Foo'] = 'write_goodbye'
-            self.assertEqual(r_bash.search_bug_patterns(pdir), 'http://bugtracker.net/bugs/2')
-            self.assertEqual(r_coreutils.search_bug_patterns(pdir), 'http://bugtracker.net/bugs/3')
-
-            # match on source package
-            r_bash['Package'] = 'bash-static 1-2'
-            self.assertEqual(r_bash.search_bug_patterns(pdir), None)
-            r_bash['SourcePackage'] = 'bash'
-            self.assertEqual(r_bash.search_bug_patterns(pdir), 'http://bugtracker.net/bugs/2')
-
-            # negative match cases
-            r_bash['Package'] = 'bash 1-21'
-            self.assertEqual(r_bash.search_bug_patterns(pdir), None,
-                'does not match on wrong bash version')
-            r_bash['Foo'] = 'zz'
-            self.assertEqual(r_bash.search_bug_patterns(pdir), None,
-                'does not match on wrong Foo value')
-            r_coreutils['Bar'] = '11'
-            self.assertEqual(r_coreutils.search_bug_patterns(pdir), None,
-                'does not match on wrong Bar value')
-
-            # various errors to check for robustness (no exceptions, just None
-            # return value)
-            del r_coreutils['Bar']
-            self.assertEqual(r_coreutils.search_bug_patterns(pdir), None,
-                'does not match on nonexisting key')
-            self.assertEqual(r_invalid.search_bug_patterns(pdir), None,
-                'gracefully handles invalid XML')
-            r_coreutils['Package'] = 'other 2'
-            self.assertEqual(r_coreutils.search_bug_patterns(pdir), None,
-                'gracefully handles nonexisting package XML file')
-            self.assertEqual(r_bash.search_bug_patterns('file:///nonexisting/directory/'), None,
-                'gracefully handles nonexisting base path')
-            # existing host, but no bug patterns
-            self.assertEqual(r_bash.search_bug_patterns('http://security.ubuntu.com/'), None,
-                'gracefully handles base path without bug patterns')
-            # nonexisting host
-            self.assertEqual(r_bash.search_bug_patterns('http://nonexisting.domain/'), None,
-                'gracefully handles nonexisting URL domain')
-        finally:
-            if pdir:
-                shutil.rmtree(pdir)
+    <pattern url="http://bugtracker.net/bugs/5">
+        <re key="SourcePackage">^bazaar$</re>
+        <re key="LogFile">AssertionError</re>
+    </pattern>
+</patterns>''')
+        patterns.flush()
+
+        # invalid XML
+        invalid = tempfile.NamedTemporaryFile(prefix='apport-')
+        invalid.write('''<?xml version="1.0"?>
+</patterns>''')
+        invalid.flush()
+
+        # create some reports
+        r_bash = Report()
+        r_bash['Package'] = 'bash 1-2'
+        r_bash['Foo'] = 'bazaar'
+
+        r_bazaar = Report()
+        r_bazaar['Package'] = 'bazaar 2-1'
+        r_bazaar['SourcePackage'] = 'bazaar'
+        r_bazaar['LogFile'] = 'AssertionError'
+
+        r_coreutils = Report()
+        r_coreutils['Package'] = 'coreutils 1'
+        r_coreutils['Bar'] = '1'
+
+        r_invalid = Report()
+        r_invalid['Package'] = 'invalid 1'
+
+        # positive match cases
+        self.assertEqual(r_bash.search_bug_patterns(patterns.name), 'http://bugtracker.net/bugs/1')
+        r_bash['Foo'] = 'write_goodbye'
+        self.assertEqual(r_bash.search_bug_patterns(patterns.name), 'http://bugtracker.net/bugs/2')
+        self.assertEqual(r_coreutils.search_bug_patterns(patterns.name), 'http://bugtracker.net/bugs/3')
+        self.assertEqual(r_bazaar.search_bug_patterns(patterns.name), 'http://bugtracker.net/bugs/5')
+
+        # negative match cases
+        r_bash['Package'] = 'bash-static 1-2'
+        self.assertEqual(r_bash.search_bug_patterns(patterns.name), None)
+        r_bash['Package'] = 'bash 1-21'
+        self.assertEqual(r_bash.search_bug_patterns(patterns.name), None,
+            'does not match on wrong bash version')
+        r_bash['Foo'] = 'zz'
+        self.assertEqual(r_bash.search_bug_patterns(patterns.name), None,
+            'does not match on wrong Foo value')
+        r_coreutils['Bar'] = '11'
+        self.assertEqual(r_coreutils.search_bug_patterns(patterns.name), None,
+            'does not match on wrong Bar value')
+        r_bazaar['SourcePackage'] = 'launchpad'
+        self.assertEqual(r_bazaar.search_bug_patterns(patterns.name), None,
+            'does not match on wrong source package')
+        r_bazaar['LogFile'] = ''
+        self.assertEqual(r_bazaar.search_bug_patterns(patterns.name), None,
+            'does not match on empty attribute')
+
+        # various errors to check for robustness (no exceptions, just None
+        # return value)
+        del r_coreutils['Bar']
+        self.assertEqual(r_coreutils.search_bug_patterns(patterns.name), None,
+            'does not match on nonexisting key')
+        self.assertEqual(r_invalid.search_bug_patterns(invalid.name), None,
+            'gracefully handles invalid XML')
+        r_coreutils['Package'] = 'other 2'
+        self.assertEqual(r_bash.search_bug_patterns('file:///nonexisting/directory/'), None,
+            'gracefully handles nonexisting base path')
+        # existing host, but no bug patterns
+        self.assertEqual(r_bash.search_bug_patterns('http://security.ubuntu.com/'), None,
+            'gracefully handles base path without bug patterns')
+        # nonexisting host
+        self.assertEqual(r_bash.search_bug_patterns('http://nonexisting.domain/'), None,
+            'gracefully handles nonexisting URL domain')
 
     def test_add_hooks_info(self):
         '''add_hooks_info().'''
@@ -1978,34 +2026,34 @@
         '''has_useful_stacktrace().'''
 
         r = Report()
-        self.failIf(r.has_useful_stacktrace())
+        self.assertFalse(r.has_useful_stacktrace())
 
         r['StacktraceTop'] = ''
-        self.failIf(r.has_useful_stacktrace())
+        self.assertFalse(r.has_useful_stacktrace())
 
         r['StacktraceTop'] = '?? ()'
-        self.failIf(r.has_useful_stacktrace())
+        self.assertFalse(r.has_useful_stacktrace())
 
         r['StacktraceTop'] = '?? ()\n?? ()'
-        self.failIf(r.has_useful_stacktrace())
+        self.assertFalse(r.has_useful_stacktrace())
 
         r['StacktraceTop'] = 'read () from /lib/libc.6.so\n?? ()'
-        self.failIf(r.has_useful_stacktrace())
+        self.assertFalse(r.has_useful_stacktrace())
 
         r['StacktraceTop'] = 'read () from /lib/libc.6.so\n?? ()\n?? ()\n?? ()'
-        self.failIf(r.has_useful_stacktrace())
+        self.assertFalse(r.has_useful_stacktrace())
 
         r['StacktraceTop'] = 'read () from /lib/libc.6.so\nfoo (i=1) from /usr/lib/libfoo.so'
-        self.assert_(r.has_useful_stacktrace())
+        self.assertTrue(r.has_useful_stacktrace())
 
         r['StacktraceTop'] = 'read () from /lib/libc.6.so\nfoo (i=1) from /usr/lib/libfoo.so\n?? ()'
-        self.assert_(r.has_useful_stacktrace())
+        self.assertTrue(r.has_useful_stacktrace())
 
         r['StacktraceTop'] = 'read () from /lib/libc.6.so\nfoo (i=1) from /usr/lib/libfoo.so\n?? ()\n?? ()'
-        self.assert_(r.has_useful_stacktrace())
+        self.assertTrue(r.has_useful_stacktrace())
 
         r['StacktraceTop'] = 'read () from /lib/libc.6.so\n?? ()\nfoo (i=1) from /usr/lib/libfoo.so\n?? ()\n?? ()'
-        self.failIf(r.has_useful_stacktrace())
+        self.assertFalse(r.has_useful_stacktrace())
 
     def test_standard_title(self):
         '''standard_title().'''
@@ -2066,7 +2114,7 @@
 subprocess.call(['pgrep', '-x',
 NameError: global name 'subprocess' is not defined'''
         self.assertEqual(report.standard_title(),
-            'apport-gtk crashed with NameError in ui_present_crash()')
+            "apport-gtk crashed with NameError in ui_present_crash(): global name 'subprocess' is not defined")
 
         # slightly weird Python crash
         report = Report()
@@ -2097,8 +2145,32 @@
 Restarting AWN usually solves this issue'''
 
         t = report.standard_title()
-        self.assert_(t.startswith('apport-gtk crashed with'))
-        self.assert_(t.endswith('setup_chooser()'))
+        self.assertTrue(t.startswith('apport-gtk crashed with'))
+        self.assertTrue(t.endswith('setup_chooser()'))
+
+        # Python crash at top level in module
+        report = Report()
+        report['ExecutablePath'] = '/usr/bin/gnome-about'
+        report['Traceback'] = '''Traceback (most recent call last):
+  File "/usr/bin/gnome-about", line 30, in <module>
+    import pygtk
+  File "/usr/lib/pymodules/python2.6/pygtk.py", line 28, in <module>
+    import nonexistent
+ImportError: No module named nonexistent
+'''
+        self.assertEqual(report.standard_title(),
+            "gnome-about crashed with ImportError in /usr/lib/pymodules/python2.6/pygtk.py: No module named nonexistent")
+
+        # Python crash at top level in main program
+        report = Report()
+        report['ExecutablePath'] = '/usr/bin/dcut'
+        report['Traceback'] = '''Traceback (most recent call last):
+  File "/usr/bin/dcut", line 28, in <module>
+    import nonexistent
+ImportError: No module named nonexistent
+'''
+        self.assertEqual(report.standard_title(),
+            "dcut crashed with ImportError in __main__: No module named nonexistent")
 
         # package install problem
         report = Report('Package')
@@ -2289,6 +2361,18 @@
 filter_func (connection=0x8075288, message=0x80768d8, user_data=0x8074da8) at libhal.c:820
 dbus_connection_dispatch (connection=0x8075288) at dbus-connection.c:4267''')
 
+        # problem with too old gdb, only assertion, nothing else
+        r = Report()
+        r['Stacktrace'] = '''#0  0x00987416 in __kernel_vsyscall ()
+No symbol table info available.
+#1  0x00ebecb1 in *__GI_raise (sig=6)
+        selftid = 945
+#2  0x00ec218e in *__GI_abort () at abort.c:59
+        save_stage = Unhandled dwarf expression opcode 0x9f
+'''
+        r._gen_stacktrace_top()
+        self.assertEqual(r['StacktraceTop'], '')
+
     def test_crash_signature(self):
         '''crash_signature().'''
 
@@ -2314,11 +2398,14 @@
 __frob (x=1) at crash.c:30'''
         self.assertEqual(r.crash_signature(), None)
 
+        r['StacktraceTop'] = ''
+        self.assertEqual(r.crash_signature(), None)
+
         # Python crashes
         del r['Signal']
         r['Traceback'] = '''Traceback (most recent call last):
   File "test.py", line 7, in <module>
-    print _f(5)
+    print(_f(5))
   File "test.py", line 5, in _f
     return g_foo00(x+1)
   File "test.py", line 2, in g_foo00

=== modified file 'apport/ui.py'
--- apport/ui.py	2010-07-09 11:18:39 +0000
+++ apport/ui.py	2011-04-20 23:32:24 +0000
@@ -13,7 +13,7 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
-__version__ = '1.14.1'
+__version__ = '1.20.1'
 
 import glob, sys, os.path, optparse, time, traceback, locale, gettext, re
 import pwd, errno, urllib, zlib
@@ -24,7 +24,9 @@
 from apport.crashdb import get_crashdb, NeedsCredentials
 from apport import unicode_gettext as _
 
-symptom_script_dir = '/usr/share/apport/symptoms'
+symptom_script_dir = os.environ.get('APPORT_SYMPTOMS_DIR',
+                                    '/usr/share/apport/symptoms')
+PF_KTHREAD = 0x200000
 
 def excstr(exception):
     '''Return exception message as unicode.'''
@@ -53,13 +55,13 @@
             execfile(symptom_script, symb)
             package = symb['run'](report, ui)
             if not package:
-                print >> sys.stderr, 'symptom script %s did not determine the affected package' % symptom_script
+                apport.error('symptom script %s did not determine the affected package', symptom_script)
                 return
             report['Symptom'] = os.path.splitext(os.path.basename(symptom_script))[0]
         except StopIteration:
             sys.exit(0)
         except:
-            print >> sys.stderr, 'symptom script %s crashed:' % symptom_script
+            apport.error('symptom script %s crashed:', symptom_script)
             traceback.print_exc()
             sys.exit(0)
 
@@ -67,7 +69,7 @@
         if report.has_key('ExecutablePath'):
             package = apport.fileutils.find_file_package(report['ExecutablePath'])
         else:
-            raise KeyError, 'called without a package, and report does not have ExecutablePath'
+            raise KeyError('called without a package, and report does not have ExecutablePath')
     try:
         report.add_package_info(package)
     except ValueError:
@@ -75,7 +77,7 @@
         # package
         if not ignore_uninstalled:
             raise
-    except SystemError, e:
+    except SystemError as e:
         report['UnreportableReason'] = excstr(e)
         return
 
@@ -112,9 +114,9 @@
 versions installed. Please upgrade the following packages and check if the \
 problem still occurs:\n\n%s') % ', '.join(old_pkgs)
 
-    # if we have a SIGABRT without an assertion message, declare as unreportable
-    if report.get('Signal') == '6' and 'AssertionMessage' not in report:
-        report['UnreportableReason'] = _('The program crashed on an assertion failure, but the message could not be retrieved. Apport does not support reporting these crashes.')
+    # disabled: if we have a SIGABRT without an assertion message, declare as unreportable
+    #if report.get('Signal') == '6' and 'AssertionMessage' not in report:
+    #    report['UnreportableReason'] = _('The program crashed on an assertion failure, but the message could not be retrieved. Apport does not support reporting these crashes.')
 
     report.anonymize()
 
@@ -124,7 +126,7 @@
         report.write(f, only_new=True)
         f.close()
         apport.fileutils.mark_report_seen(reportfile)
-        os.chmod (reportfile, 0600)
+        os.chmod (reportfile, 0o600)
 
 class UserInterface:
     '''Apport user interface API.
@@ -144,13 +146,11 @@
 
         try:
             self.crashdb = get_crashdb(None)
-        except ImportError, e:
+        except ImportError as e:
             # this can happen while upgrading python packages
-            print >> sys.stderr, 'Could not import module, is a package upgrade in progress? Error:', e
-            sys.exit(1)
+            apport.fatal('Could not import module, is a package upgrade in progress? Error: %s', str(e))
         except KeyError:
-            print >> sys.stderr, '/etc/apport/crashdb.conf is damaged: No default database'
-            sys.exit(1)
+            apport.fatal('/etc/apport/crashdb.conf is damaged: No default database')
 
         gettext.textdomain(self.gettext_domain)
         self.parse_argv()
@@ -261,7 +261,7 @@
             try:
                 if 'Dependencies' not in self.report:
                     self.collect_info()
-            except (IOError, zlib.error), e:
+            except (IOError, zlib.error) as e:
                 # can happen with broken core dumps
                 self.report = None
                 self.ui_error_message(_('Invalid problem report'),
@@ -275,11 +275,7 @@
                 self.ui_shutdown()
                 return
 
-            # check unreportable flag
-            if self.report.has_key('UnreportableReason'):
-                self.ui_info_message(_('Problem in %s') % self.report['Package'].split()[0],
-                    _('The problem cannot be reported:\n\n%s') %
-                    self.report['UnreportableReason'])
+            if self.check_unreportable():
                 return
 
             if self.handle_duplicate():
@@ -298,7 +294,7 @@
                 assert response == 'full'
 
             self.file_report()
-        except IOError, e:
+        except IOError as e:
             # fail gracefully if file is not readable for us
             if e.errno in (errno.EPERM, errno.EACCES):
                 self.ui_error_message(_('Invalid problem report'),
@@ -311,11 +307,10 @@
             else:
                 self.ui_error_message(_('Invalid problem report'), e.strerror)
                 sys.exit(1)
-        except OSError, e:
+        except OSError as e:
             # fail gracefully on ENOMEM
             if e.errno == errno.ENOMEM:
-                print >> sys.stderr, 'Out of memory, aborting'
-                sys.exit(1)
+                apport.fatal('Out of memory, aborting')
             else:
                 raise
 
@@ -343,12 +338,18 @@
         # if PID is given, add info
         if self.options.pid:
             try:
-                self.report.add_proc_info(self.options.pid)
-            except ValueError:
+                stat = open('/proc/%s/stat' % self.options.pid).read().split()
+                flags = int(stat[8])
+                if flags & PF_KTHREAD:
+                    # this PID is a kernel thread
+                    self.options.package = 'linux'
+                else:
+                    self.report.add_proc_info(self.options.pid)
+            except (ValueError, IOError):
                 self.ui_error_message(_('Invalid PID'),
                         _('The specified process ID does not belong to a program.'))
                 return False
-            except OSError, e:
+            except OSError as e:
                 # silently ignore nonexisting PIDs; the user must not close the
                 # application prematurely
                 if e.errno == errno.ENOENT:
@@ -372,7 +373,7 @@
 
         try:
             self.collect_info(symptom_script)
-        except ValueError, e:
+        except ValueError as e:
             if str(e) == 'package does not exist':
                 if not self.cur_package:
                     self.ui_error_message(_('Invalid problem report'), 
@@ -384,13 +385,11 @@
             else:
                 raise
 
-        # check unreportable flag
-        if self.report.has_key('UnreportableReason'):
-            self.ui_info_message(_('Problem in %s') % self.report['Package'].split()[0],
-                _('The problem cannot be reported:\n\n%s') %
-                self.report['UnreportableReason'])
+        if self.check_unreportable():
             return
 
+        self.add_extra_tags()
+
         if self.handle_duplicate():
             return True
 
@@ -402,10 +401,10 @@
 
         if self.options.save:
             try:
-                f = open(self.options.save, 'w')
+                f = open(os.path.expanduser(self.options.save), 'w')
                 self.report.write(f)
                 f.close()
-            except (IOError, OSError), e:
+            except (IOError, OSError) as e:
                 self.ui_error_message(_('Cannot create report'), excstr(e))
         else:
             # show what's being sent
@@ -449,7 +448,7 @@
 
         info_collected = False
         for p in pkgs:
-            #print 'Collecting apport information for source package %s...' % p
+            #print('Collecting apport information for source package %s...' % p)
             self.cur_package = p
             self.report['SourcePackage'] = p
             self.report['Package'] = p # no way to find this out
@@ -460,7 +459,7 @@
                 apport.packaging.get_version(p)
             except ValueError:
                 if not os.path.exists(os.path.join(apport.report._hook_dir, 'source_%s.py' % p)):
-                    print 'Package %s not installed and no hook available, ignoring' % p
+                    print('Package %s not installed and no hook available, ignoring' % p)
                     continue
             self.collect_info(ignore_uninstalled=True)
             info_collected = True
@@ -472,6 +471,7 @@
 
         self.report.add_user_info()
         self.report.add_proc_environ()
+        self.add_extra_tags()
 
         # delete the uninteresting keys
         del self.report['ProblemType']
@@ -506,19 +506,29 @@
         symptom_names = []
         symptom_descriptions = []
         for script in scripts:
+            # scripts with an underscore can be used for private libraries
+            if os.path.basename(script).startswith('_'):
+                continue
             symb = {}
             try:
                 execfile(script, symb)
             except:
-                print >> sys.stderr, 'symptom script %s is invalid' % script
+                apport.error('symptom script %s is invalid', script)
                 traceback.print_exc()
                 continue
+            if 'run' not in symb:
+                apport.error('symptom script %s does not define run() function', script)
+                continue
             symptom_names.append(os.path.splitext(os.path.basename(script))[0])
             symptom_descriptions.append(symb.get('description', symptom_names[-1]))
 
         if not symptom_names:
             return False
 
+        symptom_descriptions, symptom_names = \
+            zip(*sorted(zip(symptom_descriptions, symptom_names)))
+        symptom_descriptions = list(symptom_descriptions)
+        symptom_names = list(symptom_names)
         symptom_names.append(None)
         symptom_descriptions.append('Other problem')
 
@@ -559,14 +569,32 @@
         elif self.options.update_report:
             return self.run_update_report()
         elif self.options.version:
-            print __version__
+            print(__version__)
             return True
         elif self.options.crash_file:
             try:
                 self.run_crash(self.options.crash_file, False)
-            except OSError, e:
+            except OSError as e:
                 self.ui_error_message(_('Invalid problem report'), excstr(e))
             return True
+        elif self.options.window:
+                self.ui_info_message('', _('After closing this message '
+                    'please click on an application window to report a problem about it.'))
+                xprop = subprocess.Popen(['xprop', '_NET_WM_PID'],
+                        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                (out, err) = xprop.communicate()
+                if xprop.returncode == 0:
+                    try:
+                        self.options.pid = int(out.split()[-1])
+                    except ValueError:
+                        self.ui_error_message(_('Cannot create report'), 
+                                _('xprop failed to determine process ID of the window'))
+                        return True
+                    return self.run_report_bug()
+                else:
+                    self.ui_error_message(_('Cannot create report'), 
+                            _('xprop failed to determine process ID of the window') + '\n\n' + err)
+                    return True
         else:
             return self.run_crashes()
 
@@ -581,8 +609,9 @@
         '''
         optparser = optparse.OptionParser(_('%prog <report number>'))
         optparser.add_option('-p', '--package',
-            help=_('Specify package name.)'),
-            dest='package', default=None)
+            help=_('Specify package name.)'))
+        optparser.add_option('--tag', action='append', default=[],
+            help=_('Add an extra tag to the report. Can be specified multiple times.'))
         (self.options, self.args) = optparser.parse_args()
 
         if len(self.args) != 1 or not self.args[0].isdigit():
@@ -613,30 +642,31 @@
                 return
 
         optparser = optparse.OptionParser(_('%prog [options] [symptom|pid|package|program path|.apport/.crash file]'))
-        optparser.add_option('-f', '--file-bug',
-            help=_('Start in bug filing mode. Requires --package and an optional --pid, or just a --pid. If neither is given, display a list of known symptoms. (Implied if a single argument is given.)'),
-            action='store_true', dest='filebug', default=False)
-        optparser.add_option('-u', '--update-bug', type='int',
-            help=_('Start in bug updating mode. Can take an optional --package.'),
-            dest='update_report')
+        optparser.add_option('-f', '--file-bug', action='store_true',
+            dest='filebug', default=False,
+            help=_('Start in bug filing mode. Requires --package and an optional --pid, or just a --pid. If neither is given, display a list of known symptoms. (Implied if a single argument is given.)'))
+        optparser.add_option('-w', '--window', action='store_true', default=False,
+        	help=_('Click a window as a target for filing a problem report.'))
+        optparser.add_option('-u', '--update-bug', type='int', dest='update_report',
+            help=_('Start in bug updating mode. Can take an optional --package.'))
         optparser.add_option('-s', '--symptom', metavar='SYMPTOM',
-            help=_('File a bug report about a symptom. (Implied if symptom name is given as only argument.)'), 
-            dest='symptom')
+            help=_('File a bug report about a symptom. (Implied if symptom name is given as only argument.)'))
         optparser.add_option('-p', '--package',
-            help=_('Specify package name in --file-bug mode. This is optional if a --pid is specified. (Implied if package name is given as only argument.)'),
-            action='store', type='string', dest='package', default=None)
-        optparser.add_option('-P', '--pid',
-            help=_('Specify a running program in --file-bug mode. If this is specified, the bug report will contain more information. (Implied if pid is given as only argument.)'),
-            action='store', type='int', dest='pid', default=None)
-        optparser.add_option('-c', '--crash-file',
-            help=_('Report the crash from given .apport or .crash file instead of the pending ones in %s. (Implied if file is given as only argument.)') % apport.fileutils.report_dir,
-            action='store', type='string', dest='crash_file', default=None, metavar='PATH')
-        optparser.add_option('--save',
-            help=_('In --file-bug mode, save the collected information into a file instead of reporting it. This file can then be reported with --crash-file later on.'),
-            type='string', dest='save', default=None, metavar='PATH')
-        optparser.add_option('-v', '--version',
-            help=_('Print the Apport version number.'),
-            action='store_true', dest='version', default=None)
+            help=_('Specify package name in --file-bug mode. This is optional if a --pid is specified. (Implied if package name is given as only argument.)'))
+        optparser.add_option('-P', '--pid', type='int',
+            help=_('Specify a running program in --file-bug mode. If this is specified, the bug report will contain more information.  (Implied if pid is given as only argument.)'))
+        optparser.add_option('-c', '--crash-file', metavar='PATH',
+            help=_('Report the crash from given .apport or .crash file instead of the pending ones in %s. (Implied if file is given as only argument.)') % apport.fileutils.report_dir)
+        optparser.add_option('--save', metavar='PATH',
+            help=_('In bug filing mode, save the collected information into a file instead of reporting it. This file can then be reported later on from a different machine.'))
+        optparser.add_option('--tag', action='append', default=[],
+            help=_('Add an extra tag to the report. Can be specified multiple times.'))
+        optparser.add_option('-v', '--version', action='store_true',
+            help=_('Print the Apport version number.'))
+
+        if len(sys.argv) > 0 and cmd.endswith('-bug'):
+            for o in ('-f', '-u', '-s', '-p', '-P', '-c'):
+                optparser.get_option(o).help = optparse.SUPPRESS_HELP
 
         (self.options, self.args) = optparser.parse_args()
 
@@ -692,11 +722,11 @@
     def format_filesize(self, size):
         '''Format the given integer as humanly readable and i18n'ed file size.'''
 
-        if size < 1048576:
-            return locale.format('%.1f KiB', size/1024.)
-        if size < 1024 * 1048576:
-            return locale.format('%.1f MiB', size / 1048576.)
-        return locale.format('%.1f GiB', size / float(1024 * 1048576))
+        if size < 1000000:
+            return locale.format('%.1f', size/1000.) + ' KB'
+        if size < 1000000000:
+            return locale.format('%.1f', size / 1000000.) + ' MB'
+        return locale.format('%.1f', size / float(1000000000)) + ' GB'
 
     def get_complete_size(self):
         '''Return the size of the complete report.'''
@@ -847,12 +877,12 @@
 
         # figure out appropriate web browser
         try:
-            # if ksmserver is running, try kfmclient
+            # if ksmserver is running, try kde-open
             try:
                 if os.getenv('DISPLAY') and \
                         subprocess.call(['pgrep', '-x', '-u', str(uid), 'ksmserver'],
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0:
-                    subprocess.call(sudo_prefix + ['kfmclient', 'openURL', url])
+                    subprocess.call(sudo_prefix + ['kde-open', url])
                     sys.exit(0)
             except OSError:
                 pass
@@ -893,7 +923,7 @@
             webbrowser.open(url, new=True, autoraise=True)
             sys.exit(0)
 
-        except Exception, e:
+        except Exception as e:
             os.write(w, str(e))
             sys.exit(1)
 
@@ -925,7 +955,7 @@
                 upthread.exc_raise()
             except KeyboardInterrupt:
                 sys.exit(1)
-            except NeedsCredentials, e:
+            except NeedsCredentials as e:
                 message = _('Please enter your account information for the '
                             '%s bug tracking system')
                 data = self.ui_question_userpass(message % excstr(e))
@@ -936,13 +966,14 @@
                                                  args=(self.report,
                                                        progress_callback))
                     upthread.start()
-            except Exception, e:
+            except Exception as e:
                 self.ui_error_message(_('Network problem'),
                         '%s\n\n%s' % (
                             _('Cannot connect to crash database, please check your Internet connection.'),
                              excstr(e)))
                 return
 
+        upthread.exc_raise()
         ticket = upthread.return_value()
         self.ui_stop_upload_progress()
 
@@ -961,17 +992,17 @@
             self.report = apport.Report()
             self.report.load(open(path), binary='compressed')
             if 'ProblemType' not in self.report:
-                raise ValueError, 'Report does not contain "ProblemType" field'
+                raise ValueError('Report does not contain "ProblemType" field')
         except MemoryError:
             self.report = None
             self.ui_error_message(_('Memory exhaustion'),
                 _('Your system does not have enough memory to process this crash report.'))
             return False
-        except IOError, e:
+        except IOError as e:
             self.report = None
             self.ui_error_message(_('Invalid problem report'), e.strerror)
             return False
-        except (TypeError, ValueError, zlib.error), e:
+        except (TypeError, ValueError, zlib.error) as e:
             self.report = None
             self.ui_error_message(_('Invalid problem report'),
                 '%s\n\n%s' % (
@@ -1004,6 +1035,20 @@
 
         return True
 
+    def check_unreportable(self):
+        '''Check if the current report is unreportable.
+
+        If so, display an info message and return True.
+        '''
+        if 'UnreportableReason' in self.report:
+            if isinstance(self.report['UnreportableReason'], str):
+                self.report['UnreportableReason'] = self.report['UnreportableReason'].decode('UTF-8')
+            self.ui_info_message(_('Problem in %s') % self.report['Package'].split()[0],
+                _('The problem cannot be reported:\n\n%s') %
+                self.report['UnreportableReason'])
+            return True
+        return False
+
     def get_desktop_entry(self):
         '''Return a matching xdg.DesktopEntry for the current report.
         
@@ -1037,6 +1082,16 @@
         self.open_url(self.report['BugPatternURL'])
         return True
 
+    def add_extra_tags(self):
+        '''Add extra tags to report specified with --tags on CLI.'''
+
+        assert self.report
+        if self.options.tag:
+            tags = self.report.get('Tags', '')
+            if tags:
+                tags += ' '
+            self.report['Tags'] = tags + ' '.join(self.options.tag)
+
     #
     # abstract UI methods that must be implemented in derived classes
     #
@@ -1058,7 +1113,7 @@
         - Valid values for the 'blacklist' key: True or False (True will cause
           the invocation of report.mark_ignore()).
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_present_package_error(self, desktopentry):
         '''Ask what to do with a package failure.
@@ -1069,7 +1124,7 @@
         Return the action: ignore ('cancel'), or report a bug about the problem
         ('report').
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_present_kernel_error(self, desktopentry):
         '''Ask what to do with a kernel error.
@@ -1080,7 +1135,7 @@
         Return the action: ignore ('cancel'), or report a bug about the problem
         ('report').
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_present_report_details(self, is_update):
         '''Show details of the bug report.
@@ -1097,17 +1152,17 @@
         Return the action: send full report ('full'), send reduced report
         ('reduced'), or do not send anything ('cancel').
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_info_message(self, title, text):
         '''Show an information message box with given title and text.'''
 
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_error_message(self, title, text):
         '''Show an error message box with given title and text.'''
 
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_start_info_collection_progress(self):
         '''Open a indefinite progress bar for data collection.
@@ -1115,26 +1170,26 @@
         This tells the user to wait while debug information is being
         collected.
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_pulse_info_collection_progress(self):
         '''Advance the data collection progress bar.
 
         This function is called every 100 ms.
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_stop_info_collection_progress(self):
         '''Close debug data collection progress window.'''
 
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_start_upload_progress(self):
         '''Open progress bar for data upload.
 
         This tells the user to wait while debug information is being uploaded.
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_set_upload_progress(self, progress):
         '''Update data upload progress bar.
@@ -1144,12 +1199,12 @@
 
         This function is called every 100 ms.
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_stop_upload_progress(self):
         '''Close debug data upload progress window.'''
 
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_shutdown(self):
         '''Called right before terminating the program.
@@ -1169,7 +1224,7 @@
         Return True if the user selected "Yes", False if selected "No" or
         "None" on cancel/dialog closing.
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_question_choice(self, text, options, multiple):
         '''Show an question with predefined choices.
@@ -1181,14 +1236,14 @@
         Return list of selected option indexes, or None if the user cancelled.
         If multiple == False, the list will always have one element.
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_question_file(self, text):
         '''Show a file selector dialog.
 
         Return path if the user selected a file, or None if cancelled.
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
     def ui_question_userpass(self, message):
         '''Request username and password from user.
@@ -1198,7 +1253,7 @@
 
         Return a tuple (username, password), or None if cancelled.
         '''
-        raise NotImplementedError, 'this function must be overridden by subclasses'
+        raise NotImplementedError('this function must be overridden by subclasses')
 
 class HookUI:
     '''Interactive functions which can be used in package hooks.
@@ -1303,7 +1358,10 @@
 
 if  __name__ == '__main__':
     import unittest, shutil, signal, tempfile, resource
-    from cStringIO import StringIO
+    try:
+        from cStringIO import StringIO
+    except ImportError:
+        from io import StringIO
     import apport.report
     import problem_report
     import apport.crashdb_impl.memory
@@ -1314,14 +1372,14 @@
         def __init__(self):
             # use our dummy crashdb
             self.crashdb_conf = tempfile.NamedTemporaryFile()
-            print >> self.crashdb_conf, '''default = 'testsuite'
+            self.crashdb_conf.write('''default = 'testsuite'
 databases = {
     'testsuite': { 
         'impl': 'memory',
-        'bug_pattern_base': None
+        'bug_pattern_url': None
     }
 }
-'''
+''')
             self.crashdb_conf.flush()
 
             os.environ['APPORT_CRASHDB_CONF'] = self.crashdb_conf.name
@@ -1487,14 +1545,14 @@
         def test_format_filesize(self):
             '''format_filesize().'''
 
-            self.assertEqual(self.ui.format_filesize(0), '0.0 KiB')
-            self.assertEqual(self.ui.format_filesize(2048), '2.0 KiB')
-            self.assertEqual(self.ui.format_filesize(2560), '2.5 KiB')
-            self.assertEqual(self.ui.format_filesize(1000000), '976.6 KiB')
-            self.assertEqual(self.ui.format_filesize(1048576), '1.0 MiB')
-            self.assertEqual(self.ui.format_filesize(2.7*1048576), '2.7 MiB')
-            self.assertEqual(self.ui.format_filesize(1024*1048576), '1.0 GiB')
-            self.assertEqual(self.ui.format_filesize(2560*1048576), '2.5 GiB')
+            self.assertEqual(self.ui.format_filesize(0), '0.0 KB')
+            self.assertEqual(self.ui.format_filesize(2048), '2.0 KB')
+            self.assertEqual(self.ui.format_filesize(2560), '2.6 KB')
+            self.assertEqual(self.ui.format_filesize(999999), '1000.0 KB')
+            self.assertEqual(self.ui.format_filesize(1000000), '1.0 MB')
+            self.assertEqual(self.ui.format_filesize(2.7*1000000), '2.7 MB')
+            self.assertEqual(self.ui.format_filesize(1024*1000000), '1.0 GB')
+            self.assertEqual(self.ui.format_filesize(2560*1000000), '2.6 GB')
 
         def test_get_size_loaded(self):
             '''get_complete_size() and get_reduced_size() for loaded Reports.'''
@@ -1503,21 +1561,21 @@
 
             fsize = os.path.getsize(self.report_file.name)
             complete_ratio = float(self.ui.get_complete_size()) / fsize
-            self.assert_(complete_ratio >= 0.99 and complete_ratio <= 1.01)
+            self.assertTrue(complete_ratio >= 0.99 and complete_ratio <= 1.01)
                 
             rs = self.ui.get_reduced_size()
-            self.assert_(rs > 1000)
-            self.assert_(rs < 10000)
+            self.assertTrue(rs > 1000)
+            self.assertTrue(rs < 10000)
 
             # now add some information (e. g. from package hooks)
             self.ui.report['ExtraInfo'] = 'A' * 50000
             s = self.ui.get_complete_size()
-            self.assert_(s >= fsize + 49900)
-            self.assert_(s < fsize + 60000)
+            self.assertTrue(s >= fsize + 49900)
+            self.assertTrue(s < fsize + 60000)
 
             rs = self.ui.get_reduced_size()
-            self.assert_(rs > 51000)
-            self.assert_(rs < 60000)
+            self.assertTrue(rs > 51000)
+            self.assertTrue(rs < 60000)
 
         def test_get_size_constructed(self):
             '''get_complete_size() and get_reduced_size() for on-the-fly Reports.'''
@@ -1526,8 +1584,8 @@
             self.ui.report['Hello'] = 'World'
 
             s = self.ui.get_complete_size()
-            self.assert_(s > 5)
-            self.assert_(s < 100)
+            self.assertTrue(s > 5)
+            self.assertTrue(s < 100)
 
             self.assertEqual(s, self.ui.get_reduced_size())
 
@@ -1546,7 +1604,7 @@
             self.update_report_file()
             self.ui.load_report(self.report_file.name)
 
-            self.assert_(self.ui.report == None)
+            self.assertTrue(self.ui.report == None)
             self.assertEqual(self.ui.msg_title, _('Invalid problem report'))
             self.assertEqual(self.ui.msg_severity, 'info')
 
@@ -1563,7 +1621,7 @@
             self.report_file.flush()
 
             self.ui.load_report(self.report_file.name)
-            self.assert_(self.ui.report == None)
+            self.assertTrue(self.ui.report == None)
             self.assertEqual(self.ui.msg_title, _('Invalid problem report'))
             self.assertEqual(self.ui.msg_severity, 'error')
 
@@ -1579,8 +1637,8 @@
 
             self.ui.restart()
             time.sleep(1) # FIXME: race condition
-            self.assert_(os.path.exists(p))
-            self.assert_(not os.path.exists(r))
+            self.assertTrue(os.path.exists(p))
+            self.assertTrue(not os.path.exists(r))
             os.unlink(p)
 
             # test with RespawnCommand
@@ -1590,8 +1648,8 @@
 
             self.ui.restart()
             time.sleep(1) # FIXME: race condition
-            self.assert_(not os.path.exists(p))
-            self.assert_(os.path.exists(r))
+            self.assertTrue(not os.path.exists(p))
+            self.assertTrue(os.path.exists(r))
             os.unlink(r)
 
             # test that invalid command does not make us fall apart
@@ -1606,7 +1664,7 @@
             # report without any information (distro bug)
             self.ui.report = apport.Report()
             self.ui.collect_info()
-            self.assert_(set(['Date', 'Uname', 'DistroRelease', 'ProblemType']).issubset(
+            self.assertTrue(set(['Date', 'Uname', 'DistroRelease', 'ProblemType']).issubset(
                 set(self.ui.report.keys())))
             self.assertEqual(self.ui.ic_progress_pulses, 0,
                 'no progress dialog for distro bug info collection')
@@ -1624,10 +1682,10 @@
             self.ui.report['Fstab'] = ('/etc/fstab', True)
             self.ui.report['CompressedValue'] = problem_report.CompressedValue('Test')
             self.ui.collect_info()
-            self.assert_(set(['SourcePackage', 'Package', 'ProblemType',
+            self.assertTrue(set(['SourcePackage', 'Package', 'ProblemType',
                 'Uname', 'Dependencies', 'DistroRelease', 'Date',
                 'ExecutablePath']).issubset(set(self.ui.report.keys())))
-            self.assert_(self.ui.ic_progress_pulses > 0,
+            self.assertTrue(self.ui.ic_progress_pulses > 0,
                 'progress dialog for package bug info collection')
             self.assertEqual(self.ui.ic_progress_active, False,
                 'progress dialog for package bug info collection finished')
@@ -1639,10 +1697,10 @@
             self.ui.report = apport.Report()
             self.ui.cur_package = 'bash'
             self.ui.collect_info()
-            self.assert_(set(['SourcePackage', 'Package', 'ProblemType',
+            self.assertTrue(set(['SourcePackage', 'Package', 'ProblemType',
                 'Uname', 'Dependencies', 'DistroRelease',
                 'Date']).issubset(set(self.ui.report.keys())))
-            self.assert_(self.ui.ic_progress_pulses > 0,
+            self.assertTrue(self.ui.ic_progress_pulses > 0,
                 'progress dialog for package bug info collection')
             self.assertEqual(self.ui.ic_progress_active, False,
                 'progress dialog for package bug info collection finished')
@@ -1699,13 +1757,13 @@
 
             self.assertEqual(self.ui.msg_severity, None)
             self.assertEqual(self.ui.msg_title, None)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
             self.assertEqual(self.ui.opened_url, 'http://bash.bugs.example.com/%i' % self.ui.crashdb.latest_id())
 
-            self.assert_(self.ui.ic_progress_pulses > 0)
+            self.assertTrue(self.ui.ic_progress_pulses > 0)
             self.assertEqual(self.ui.report['SourcePackage'], 'bash')
-            self.assert_('Dependencies' in self.ui.report.keys())
-            self.assert_('ProcEnviron' in self.ui.report.keys())
+            self.assertTrue('Dependencies' in self.ui.report.keys())
+            self.assertTrue('ProcEnviron' in self.ui.report.keys())
             self.assertEqual(self.ui.report['ProblemType'], 'Bug')
 
             # should not crash on nonexisting package
@@ -1715,8 +1773,8 @@
 
             self.assertEqual(self.ui.msg_severity, 'error')
 
-        def test_run_report_bug_pid(self):
-            '''run_report_bug() for a pid.'''
+        def test_run_report_bug_pid_tags(self):
+            '''run_report_bug() for a pid with extra tags.'''
 
             # fork a test process
             pid = os.fork()
@@ -1728,7 +1786,7 @@
 
             try:
                 # report a bug on cat process
-                sys.argv = ['ui-test', '-f', '-P', str(pid)]
+                sys.argv = ['ui-test', '-f', '--tag', 'foo', '-P', str(pid)]
                 self.ui = _TestSuiteUserInterface()
                 self.assertEqual(self.ui.run_argv(), True)
             finally:
@@ -1736,19 +1794,21 @@
                 os.kill(pid, signal.SIGKILL)
                 os.waitpid(pid, 0)
 
-            self.assert_('SourcePackage' in self.ui.report.keys())
-            self.assert_('Dependencies' in self.ui.report.keys())
-            self.assert_('ProcMaps' in self.ui.report.keys())
+            self.assertTrue('SourcePackage' in self.ui.report.keys())
+            self.assertTrue('Dependencies' in self.ui.report.keys())
+            self.assertTrue('ProcMaps' in self.ui.report.keys())
             self.assertEqual(self.ui.report['ExecutablePath'], '/bin/sleep')
-            self.failIf(self.ui.report.has_key('ProcCmdline')) # privacy!
-            self.assert_('ProcEnviron' in self.ui.report.keys())
+            self.assertFalse(self.ui.report.has_key('ProcCmdline')) # privacy!
+            self.assertTrue('ProcEnviron' in self.ui.report.keys())
             self.assertEqual(self.ui.report['ProblemType'], 'Bug')
+            self.assertTrue('Tags' in self.ui.report.keys())
+            self.assertTrue('foo' in self.ui.report['Tags'])
 
             self.assertEqual(self.ui.msg_severity, None)
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, 'http://coreutils.bugs.example.com/%i' % self.ui.crashdb.latest_id())
-            self.assert_(self.ui.present_details_shown)
-            self.assert_(self.ui.ic_progress_pulses > 0)
+            self.assertTrue(self.ui.present_details_shown)
+            self.assertTrue(self.ui.ic_progress_pulses > 0)
 
         @classmethod
         def _find_unused_pid(klass):
@@ -1759,7 +1819,7 @@
                 pid += 1
                 try:
                     os.kill(pid, 0)
-                except OSError, e:
+                except OSError as e:
                     if e.errno == errno.ESRCH:
                         break
             return pid
@@ -1792,7 +1852,7 @@
             (fd, exename) = tempfile.mkstemp()
             os.write(fd, open('/bin/cat').read())
             os.close(fd)
-            os.chmod(exename, 0755)
+            os.chmod(exename, 0o755)
 
             # unpackaged test process
             pid = os.fork()
@@ -1810,6 +1870,25 @@
 
             self.assertEqual(self.ui.msg_severity, 'error')
 
+        def test_run_report_bug_kernel_thread(self):
+            '''run_report_bug() for a pid of a kernel thread.'''
+
+            import glob
+            pid = None
+            for path in glob.glob('/proc/[0-9]*/stat'):
+                stat = open(path).read().split()
+                flags = int(stat[8])
+                if flags & PF_KTHREAD:
+                    pid = int(stat[0])
+                    break
+
+            self.assertFalse(pid is None)
+            sys.argv = ['ui-test', '-f', '-P', str(pid)]
+            self.ui = _TestSuiteUserInterface()
+            self.ui.run_argv()
+
+            self.assertTrue(self.ui.report['Package'].startswith(apport.packaging.get_kernel_package()))
+
         def test_run_report_bug_file(self):
             '''run_report_bug() with saving report into a file.'''
 
@@ -1824,16 +1903,16 @@
             self.assertEqual(self.ui.msg_severity, None)
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
-            self.failIf(self.ui.present_details_shown)
+            self.assertFalse(self.ui.present_details_shown)
 
-            self.assert_(self.ui.ic_progress_pulses > 0)
+            self.assertTrue(self.ui.ic_progress_pulses > 0)
 
             r = apport.Report()
             r.load(open(reportfile))
 
             self.assertEqual(r['SourcePackage'], 'bash')
-            self.assert_('Dependencies' in r.keys())
-            self.assert_('ProcEnviron' in r.keys())
+            self.assertTrue('Dependencies' in r.keys())
+            self.assertTrue('ProcEnviron' in r.keys())
             self.assertEqual(r['ProblemType'], 'Bug')
 
             # report it
@@ -1845,7 +1924,7 @@
 
             self.assertEqual(self.ui.msg_text, None)
             self.assertEqual(self.ui.msg_severity, None)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
         def _gen_test_crash(self):
             '''Generate a Report with real crash data.'''
@@ -1895,7 +1974,7 @@
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
             self.assertEqual(self.ui.ic_progress_pulses, 0)
-            self.failIf(self.ui.present_details_shown)
+            self.assertFalse(self.ui.present_details_shown)
 
             # report in crash notification dialog, cancel details report
             r.write(open(report_file, 'w'))
@@ -1908,7 +1987,7 @@
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
             self.assertNotEqual(self.ui.ic_progress_pulses, 0)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
             # report in crash notification dialog, send full report
             r.write(open(report_file, 'w'))
@@ -1920,15 +1999,15 @@
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, 'http://coreutils.bugs.example.com/%i' % self.ui.crashdb.latest_id())
             self.assertNotEqual(self.ui.ic_progress_pulses, 0)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
-            self.assert_('SourcePackage' in self.ui.report.keys())
-            self.assert_('Dependencies' in self.ui.report.keys())
-            self.assert_('Stacktrace' in self.ui.report.keys())
-            self.assert_('ProcEnviron' in self.ui.report.keys())
+            self.assertTrue('SourcePackage' in self.ui.report.keys())
+            self.assertTrue('Dependencies' in self.ui.report.keys())
+            self.assertTrue('Stacktrace' in self.ui.report.keys())
+            self.assertTrue('ProcEnviron' in self.ui.report.keys())
             self.assertEqual(self.ui.report['ProblemType'], 'Crash')
-            self.assert_(len(self.ui.report['CoreDump']) > 10000)
-            self.assert_(self.ui.report['Title'].startswith('cat crashed with SIGSEGV'))
+            self.assertTrue(len(self.ui.report['CoreDump']) > 10000)
+            self.assertTrue(self.ui.report['Title'].startswith('cat crashed with SIGSEGV'))
 
             # report in crash notification dialog, send reduced report
             r.write(open(report_file, 'w'))
@@ -1940,16 +2019,16 @@
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, 'http://coreutils.bugs.example.com/%i' % self.ui.crashdb.latest_id())
             self.assertNotEqual(self.ui.ic_progress_pulses, 0)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
-            self.assert_('SourcePackage' in self.ui.report.keys())
-            self.assert_('Dependencies' in self.ui.report.keys())
-            self.assert_('Stacktrace' in self.ui.report.keys())
+            self.assertTrue('SourcePackage' in self.ui.report.keys())
+            self.assertTrue('Dependencies' in self.ui.report.keys())
+            self.assertTrue('Stacktrace' in self.ui.report.keys())
             self.assertEqual(self.ui.report['ProblemType'], 'Crash')
-            self.assert_(not self.ui.report.has_key('CoreDump'))
+            self.assertTrue(not self.ui.report.has_key('CoreDump'))
 
             # so far we did not blacklist, verify that
-            self.assert_(not self.ui.report.check_ignored())
+            self.assertTrue(not self.ui.report.check_ignored())
 
             # cancel crash notification dialog and blacklist
             r.write(open(report_file, 'w'))
@@ -1961,23 +2040,32 @@
             self.assertEqual(self.ui.opened_url, None)
             self.assertEqual(self.ui.ic_progress_pulses, 0)
 
-            self.assert_(self.ui.report.check_ignored())
+            self.assertTrue(self.ui.report.check_ignored())
 
         def test_run_crash_abort(self):
-            '''run_crash() for an unreportable abort()'''
-
-            self.report['Signal'] = '6'
-            self.report['ExecutablePath'] = '/bin/bash'
-            self.report['Package'] = 'bash 1'
-            self.update_report_file()
+            '''run_crash() for an abort() without assertion message'''
+
+            r = self._gen_test_crash()
+            r['Signal'] = '6'
+            report_file = os.path.join(apport.fileutils.report_dir, 'test.crash')
+            r.write(open(report_file, 'w'))
+
             self.ui.present_crash_response = {'action': 'report', 'blacklist': False }
             self.ui.present_details_response = 'full'
-            self.ui.run_crash(self.report_file.name)
-
-            self.assert_('assert' in self.ui.msg_text, '%s: %s' %
-                (self.ui.msg_title, self.ui.msg_text))
-            self.assertEqual(self.ui.msg_severity, 'info')
-            self.failIf(self.ui.present_details_shown)
+            self.ui.run_crash(report_file)
+
+            self.assertTrue('SourcePackage' in self.ui.report.keys())
+            self.assertTrue('Dependencies' in self.ui.report.keys())
+            self.assertTrue('Stacktrace' in self.ui.report.keys())
+            self.assertTrue('ProcEnviron' in self.ui.report.keys())
+            self.assertEqual(self.ui.report['Signal'], '6')
+
+            # we disable the ABRT filtering, we want these crashes after all 
+            #self.assertTrue('assert' in self.ui.msg_text, '%s: %s' %
+            #    (self.ui.msg_title, self.ui.msg_text))
+            #self.assertEqual(self.ui.msg_severity, 'info')
+            self.assertEqual(self.ui.msg_severity, None)
+            self.assertTrue(self.ui.present_details_shown)
 
         def test_run_crash_argv_file(self):
             '''run_crash() through a file specified on the command line.'''
@@ -1994,21 +2082,21 @@
 
             self.assertEqual(self.ui.msg_text, None)
             self.assertEqual(self.ui.msg_severity, None)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
             # unreportable
             self.report['Package'] = 'bash'
-            self.report['UnreportableReason'] = 'It stinks.'
+            self.report['UnreportableReason'] = u'It stinks. \u2665'
             self.update_report_file()
 
             sys.argv = ['ui-test', '-c', self.report_file.name]
             self.ui = _TestSuiteUserInterface()
             self.assertEqual(self.ui.run_argv(), True)
 
-            self.assert_('It stinks.' in self.ui.msg_text, '%s: %s' %
+            self.assertTrue('It stinks.' in self.ui.msg_text, '%s: %s' %
                 (self.ui.msg_title, self.ui.msg_text))
             self.assertEqual(self.ui.msg_severity, 'info')
-            self.failIf(self.ui.present_details_shown)
+            self.assertFalse(self.ui.present_details_shown)
 
             # should not die with an exception on an invalid name
             sys.argv = ['ui-test', '-c', '/nonexisting.crash' ]
@@ -2029,7 +2117,7 @@
 
             self.ui.run_crash(self.report_file.name)
 
-            self.assert_('It stinks.' in self.ui.msg_text, '%s: %s' %
+            self.assertTrue('It stinks.' in self.ui.msg_text, '%s: %s' %
                 (self.ui.msg_title, self.ui.msg_text))
             self.assertEqual(self.ui.msg_severity, 'info')
 
@@ -2077,7 +2165,7 @@
             self.ui = _TestSuiteUserInterface()
             self.ui.run_crash(report_file)
             self.assertEqual(self.ui.msg_severity, 'error')
-            self.assert_('memory' in self.ui.msg_text, '%s: %s' %
+            self.assertTrue('memory' in self.ui.msg_text, '%s: %s' %
                 (self.ui.msg_title, self.ui.msg_text))
 
         def test_run_crash_preretraced(self):
@@ -2106,7 +2194,7 @@
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
             self.assertEqual(self.ui.ic_progress_pulses, 0)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
            
         def test_run_crash_errors(self):
             '''run_crash() on various error conditions.'''
@@ -2185,7 +2273,7 @@
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
             self.assertEqual(self.ui.ic_progress_pulses, 0)
-            self.failIf(self.ui.present_details_shown)
+            self.assertFalse(self.ui.present_details_shown)
 
             # report in crash notification dialog, send report
             r.write(open(report_file, 'w'))
@@ -2196,16 +2284,16 @@
             self.assertEqual(self.ui.msg_severity, None)
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, 'http://bash.bugs.example.com/%i' % self.ui.crashdb.latest_id())
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
-            self.assert_('SourcePackage' in self.ui.report.keys())
-            self.assert_('Package' in self.ui.report.keys())
+            self.assertTrue('SourcePackage' in self.ui.report.keys())
+            self.assertTrue('Package' in self.ui.report.keys())
             self.assertEqual(self.ui.report['ProblemType'], 'Package')
 
             # verify that additional information has been collected
-            self.assert_('Architecture' in self.ui.report.keys())
-            self.assert_('DistroRelease' in self.ui.report.keys())
-            self.assert_('Uname' in self.ui.report.keys())
+            self.assertTrue('Architecture' in self.ui.report.keys())
+            self.assertTrue('DistroRelease' in self.ui.report.keys())
+            self.assertTrue('Uname' in self.ui.report.keys())
 
         def test_run_crash_kernel(self):
             '''run_crash() for a kernel error.'''
@@ -2235,7 +2323,7 @@
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
             self.assertEqual(self.ui.ic_progress_pulses, 0)
-            self.failIf(self.ui.present_details_shown)
+            self.assertFalse(self.ui.present_details_shown)
 
             # report in crash notification dialog, send report
             r.write(open(report_file, 'w'))
@@ -2247,11 +2335,11 @@
                 ' ' + str(self.ui.msg_text))
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, 'http://linux.bugs.example.com/%i' % self.ui.crashdb.latest_id())
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
-            self.assert_('SourcePackage' in self.ui.report.keys())
+            self.assertTrue('SourcePackage' in self.ui.report.keys())
             # did we run the hooks properly?
-            self.assert_('KernelDebug' in self.ui.report.keys())
+            self.assertTrue('KernelDebug' in self.ui.report.keys())
             self.assertEqual(self.ui.report['ProblemType'], 'KernelCrash')
 
         def test_run_crash_anonymity(self):
@@ -2265,7 +2353,7 @@
             self.ui.present_details_response = 'cancel'
             self.ui.run_crash(report_file)
 
-            self.failIf('ProcCwd' in self.ui.report)
+            self.assertFalse('ProcCwd' in self.ui.report)
 
             dump = StringIO()
             self.ui.report.write(dump)
@@ -2274,7 +2362,7 @@
             bad_strings = [os.uname()[1], p[0], p[4], p[5], os.getcwd()]
 
             for s in bad_strings:
-                self.failIf(s in dump.getvalue(), 'dump contains sensitive string: %s' % s)
+                self.assertFalse(s in dump.getvalue(), 'dump contains sensitive string: %s' % s)
 
         def test_run_update_report_nonexisting_package_from_bug(self):
             '''run_update_report() on a nonexisting package (from bug).'''
@@ -2285,9 +2373,9 @@
                     '', {'dummy_data': 1})
 
             self.assertEqual(self.ui.run_argv(), False)
-            self.assert_('No additional information collected.' in
+            self.assertTrue('No additional information collected.' in
                     self.ui.msg_text)
-            self.failIf(self.ui.present_details_shown)
+            self.assertFalse(self.ui.present_details_shown)
 
         def test_run_update_report_nonexisting_package_cli(self):
             '''run_update_report() on a nonexisting package (CLI argument).'''
@@ -2298,9 +2386,9 @@
                     '', {'dummy_data': 1})
 
             self.assertEqual(self.ui.run_argv(), False)
-            self.assert_('No additional information collected.' in
+            self.assertTrue('No additional information collected.' in
                     self.ui.msg_text)
-            self.failIf(self.ui.present_details_shown)
+            self.assertFalse(self.ui.present_details_shown)
 
         def test_run_update_report_existing_package_from_bug(self):
             '''run_update_report() on an existing package (from bug).'''
@@ -2316,17 +2404,17 @@
             self.assertEqual(self.ui.msg_severity, None, self.ui.msg_text)
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
-            self.assert_(self.ui.present_details_shown)
-
-            self.assert_(self.ui.ic_progress_pulses > 0)
-            self.assert_(self.ui.report['Package'].startswith('bash '))
-            self.assert_('Dependencies' in self.ui.report.keys())
-            self.assert_('ProcEnviron' in self.ui.report.keys())
-
-        def test_run_update_report_existing_package_cli(self):
-            '''run_update_report() on an existing package (CLI argument).'''
-
-            sys.argv = ['ui-test', '-u', '1', '-p', 'bash']
+            self.assertTrue(self.ui.present_details_shown)
+
+            self.assertTrue(self.ui.ic_progress_pulses > 0)
+            self.assertTrue(self.ui.report['Package'].startswith('bash '))
+            self.assertTrue('Dependencies' in self.ui.report.keys())
+            self.assertTrue('ProcEnviron' in self.ui.report.keys())
+
+        def test_run_update_report_existing_package_cli_tags(self):
+            '''run_update_report() on an existing package (CLI argument) with extra tag'''
+
+            sys.argv = ['ui-test', '-u', '1', '-p', 'bash', '--tag', 'foo']
             self.ui = _TestSuiteUserInterface()
             self.ui.crashdb = apport.crashdb_impl.memory.CrashDatabase(None,
                     '', {'dummy_data': 1})
@@ -2335,12 +2423,13 @@
             self.assertEqual(self.ui.msg_severity, None, self.ui.msg_text)
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
-            self.assert_(self.ui.ic_progress_pulses > 0)
-            self.assert_(self.ui.report['Package'].startswith('bash '))
-            self.assert_('Dependencies' in self.ui.report.keys())
-            self.assert_('ProcEnviron' in self.ui.report.keys())
+            self.assertTrue(self.ui.ic_progress_pulses > 0)
+            self.assertTrue(self.ui.report['Package'].startswith('bash '))
+            self.assertTrue('Dependencies' in self.ui.report.keys())
+            self.assertTrue('ProcEnviron' in self.ui.report.keys())
+            self.assertTrue('foo' in self.ui.report['Tags'])
 
         def test_run_update_report_existing_package_cli_cmdname(self):
             '''run_update_report() on an existing package (-collect program).'''
@@ -2354,12 +2443,12 @@
             self.assertEqual(self.ui.msg_severity, None, self.ui.msg_text)
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
-            self.assert_(self.ui.ic_progress_pulses > 0)
-            self.assert_(self.ui.report['Package'].startswith('bash '))
-            self.assert_('Dependencies' in self.ui.report.keys())
-            self.assert_('ProcEnviron' in self.ui.report.keys())
+            self.assertTrue(self.ui.ic_progress_pulses > 0)
+            self.assertTrue(self.ui.report['Package'].startswith('bash '))
+            self.assertTrue('Dependencies' in self.ui.report.keys())
+            self.assertTrue('ProcEnviron' in self.ui.report.keys())
 
         def test_run_update_report_noninstalled_but_hook(self):
             '''run_update_report() on an uninstalled package with a source hook.'''
@@ -2377,12 +2466,12 @@
             self.assertEqual(self.ui.msg_severity, None, self.ui.msg_text)
             self.assertEqual(self.ui.msg_title, None)
             self.assertEqual(self.ui.opened_url, None)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
-            self.assert_(self.ui.ic_progress_pulses > 0)
+            self.assertTrue(self.ui.ic_progress_pulses > 0)
             self.assertEqual(self.ui.report['Package'], 'foo (not installed)')
             self.assertEqual(self.ui.report['MachineType'], 'Laptop')
-            self.assert_('ProcEnviron' in self.ui.report.keys())
+            self.assertTrue('ProcEnviron' in self.ui.report.keys())
 
         def _run_hook(self, code):
             f = open(os.path.join(self.hookdir, 'coreutils.py'), 'w')
@@ -2478,12 +2567,12 @@
             sys.argv = ['ui-test', '-s', 'foobar' ]
             self.ui = _TestSuiteUserInterface()
             self.assertEqual(self.ui.run_argv(), True)
-            self.assert_('foobar" is not known' in self.ui.msg_text)
+            self.assertTrue('foobar" is not known' in self.ui.msg_text)
             self.assertEqual(self.ui.msg_severity, 'error')
 
             # does not determine package
             f = open(os.path.join(symptom_script_dir, 'nopkg.py'), 'w')
-            print >> f, 'def run(report, ui):\n    pass'
+            f.write('def run(report, ui):\n    pass\n')
             f.close()
             orig_stderr = sys.stderr
             sys.argv = ['ui-test', '-s', 'nopkg' ]
@@ -2492,11 +2581,11 @@
             self.assertRaises(SystemExit, self.ui.run_argv)
             err = sys.stderr.getvalue()
             sys.stderr = orig_stderr
-            self.assert_('did not determine the affected package' in err)
+            self.assertTrue('did not determine the affected package' in err)
 
             # does not define run()
             f = open(os.path.join(symptom_script_dir, 'norun.py'), 'w')
-            print >> f, 'def something(x, y):\n    return 1'
+            f.write('def something(x, y):\n    return 1\n')
             f.close()
             sys.argv = ['ui-test', '-s', 'norun' ]
             self.ui = _TestSuiteUserInterface()
@@ -2504,11 +2593,11 @@
             self.assertRaises(SystemExit, self.ui.run_argv)
             err = sys.stderr.getvalue()
             sys.stderr = orig_stderr
-            self.assert_('norun.py crashed:' in err)
+            self.assertTrue('norun.py crashed:' in err)
 
             # crashing script
             f = open(os.path.join(symptom_script_dir, 'crash.py'), 'w')
-            print >> f, 'def run(report, ui):\n    return 1/0'
+            f.write('def run(report, ui):\n    return 1/0\n')
             f.close()
             sys.argv = ['ui-test', '-s', 'crash' ]
             self.ui = _TestSuiteUserInterface()
@@ -2516,45 +2605,56 @@
             self.assertRaises(SystemExit, self.ui.run_argv)
             err = sys.stderr.getvalue()
             sys.stderr = orig_stderr
-            self.assert_('crash.py crashed:' in err)
-            self.assert_('ZeroDivisionError:' in err)
+            self.assertTrue('crash.py crashed:' in err)
+            self.assertTrue('ZeroDivisionError:' in err)
 
             # working noninteractive script
             f = open(os.path.join(symptom_script_dir, 'itching.py'), 'w')
-            print >> f, 'def run(report, ui):\n  report["itch"] = "scratch"\n  return "bash"'
+            f.write('def run(report, ui):\n  report["itch"] = "scratch"\n  return "bash"\n')
             f.close()
             sys.argv = ['ui-test', '-s', 'itching' ]
             self.ui = _TestSuiteUserInterface()
             self.assertEqual(self.ui.run_argv(), True)
             self.assertEqual(self.ui.msg_text, None)
             self.assertEqual(self.ui.msg_severity, None)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
 
             self.assertEqual(self.ui.report['itch'], 'scratch')
-            self.assert_('DistroRelease' in self.ui.report)
+            self.assertTrue('DistroRelease' in self.ui.report)
             self.assertEqual(self.ui.report['SourcePackage'], 'bash')
-            self.assert_(self.ui.report['Package'].startswith('bash '))
+            self.assertTrue(self.ui.report['Package'].startswith('bash '))
             self.assertEqual(self.ui.report['ProblemType'], 'Bug')
 
+            # working noninteractive script with extra tag
+            sys.argv = ['ui-test', '--tag', 'foo', '-s', 'itching' ]
+            self.ui = _TestSuiteUserInterface()
+            self.assertEqual(self.ui.run_argv(), True)
+            self.assertEqual(self.ui.msg_text, None)
+            self.assertEqual(self.ui.msg_severity, None)
+            self.assertTrue(self.ui.present_details_shown)
+
+            self.assertEqual(self.ui.report['itch'], 'scratch')
+            self.assertTrue('foo' in self.ui.report['Tags'])
+
             # working interactive script
             f = open(os.path.join(symptom_script_dir, 'itching.py'), 'w')
-            print >> f, '''def run(report, ui):
+            f.write('''def run(report, ui):
     report['itch'] = 'slap'
     report['q'] = str(ui.yesno('do you?'))
     return 'bash'
-'''
+''')
             f.close()
             sys.argv = ['ui-test', '-s', 'itching' ]
             self.ui = _TestSuiteUserInterface()
             self.ui.question_yesno_response = True
             self.assertEqual(self.ui.run_argv(), True)
-            self.assert_(self.ui.present_details_shown)
+            self.assertTrue(self.ui.present_details_shown)
             self.assertEqual(self.ui.msg_text, 'do you?')
 
             self.assertEqual(self.ui.report['itch'], 'slap')
-            self.assert_('DistroRelease' in self.ui.report)
+            self.assertTrue('DistroRelease' in self.ui.report)
             self.assertEqual(self.ui.report['SourcePackage'], 'bash')
-            self.assert_(self.ui.report['Package'].startswith('bash '))
+            self.assertTrue(self.ui.report['Package'].startswith('bash '))
             self.assertEqual(self.ui.report['ProblemType'], 'Bug')
             self.assertEqual(self.ui.report['q'], 'True')
 
@@ -2562,13 +2662,13 @@
             '''run_report_bug() without specifying arguments and available symptoms.'''
 
             f = open(os.path.join(symptom_script_dir, 'foo.py'), 'w')
-            print >> f, '''description = 'foo does not work'
+            f.write('''description = 'foo does not work'
 def run(report, ui):
     return 'bash'
-'''
+''')
             f.close()
             f = open(os.path.join(symptom_script_dir, 'bar.py'), 'w')
-            print >> f, 'def run(report, ui):\n  return "coreutils"'
+            f.write('def run(report, ui):\n  return "coreutils"\n')
             f.close()
 
             sys.argv = ['ui-test', '-f']
@@ -2577,30 +2677,28 @@
             self.ui.question_choice_response = None
             self.assertEqual(self.ui.run_argv(), True)
             self.assertEqual(self.ui.msg_severity, None)
-            self.assert_('kind of problem' in self.ui.msg_text)
+            self.assertTrue('kind of problem' in self.ui.msg_text)
             self.assertEqual(set(self.ui.msg_choices), 
                     set(['bar', 'foo does not work', 'Other problem']))
 
             # cancelled
             self.assertEqual(self.ui.ic_progress_pulses, 0)
             self.assertEqual(self.ui.report, None)
-            self.failIf(self.ui.present_details_shown)
+            self.assertFalse(self.ui.present_details_shown)
 
             # now, choose foo -> bash report
             self.ui.question_choice_response = [self.ui.msg_choices.index('foo does not work')]
             self.assertEqual(self.ui.run_argv(), True)
             self.assertEqual(self.ui.msg_severity, None)
-            self.assert_(self.ui.ic_progress_pulses > 0)
-            self.assert_(self.ui.present_details_shown)
-            self.assert_(self.ui.report['Package'].startswith('bash'))
+            self.assertTrue(self.ui.ic_progress_pulses > 0)
+            self.assertTrue(self.ui.present_details_shown)
+            self.assertTrue(self.ui.report['Package'].startswith('bash'))
 
-        def test_parse_argv(self):
+        def test_parse_argv_single_arg(self):
             '''parse_args() option inference for a single argument'''
 
-            def _chk(program_name, arg, expected_opts, argv_options=None):
+            def _chk(program_name, arg, expected_opts):
                 sys.argv = [program_name]
-                if argv_options:
-                    sys.argv += argv_options
                 if arg:
                     sys.argv.append(arg)
                 orig_stderr = sys.stderr
@@ -2617,71 +2715,144 @@
             # no arguments -> show pending crashes
             _chk('apport-gtk', None, {'filebug': False, 'package': None,
                 'pid': None, 'crash_file': None, 'symptom': None, 
-                'update_report': None, 'save': None})
-            # ... except when being called as '*-bug', then default to bug mode
-            _chk('apport-bug', None, {'filebug': True, 'package': None,
-                'pid': None, 'crash_file': None, 'symptom': None, 
-                'update_report': None, 'save': None})
+                'update_report': None, 'save': None, 'window': False, 
+                'tag': []})
             # updating report not allowed without args
             self.assertRaises(SystemExit, _chk, 'apport-collect', None, {})
 
             # package 
             _chk('apport-kde', 'coreutils', {'filebug': True, 'package':
                 'coreutils', 'pid': None, 'crash_file': None, 'symptom': None, 
-                'update_report': None, 'save': None})
-            _chk('apport-bug', 'coreutils', {'filebug': True, 'package':
-                'coreutils', 'pid': None, 'crash_file': None, 'symptom': None, 
-                'update_report': None, 'save': None})
-            _chk('apport-bug', 'coreutils', {'filebug': True, 'package':
-                'coreutils', 'pid': None, 'crash_file': None, 'symptom': None, 
-                'update_report': None, 'save': 'foo.apport'}, 
-                ['--save', 'foo.apport'])
+                'update_report': None, 'save': None, 'window': False, 
+                'tag': []})
 
             # symptom is preferred over package
             f = open(os.path.join(symptom_script_dir, 'coreutils.py'), 'w')
-            print >> f, '''description = 'foo does not work'
+            f.write('''description = 'foo does not work'
 def run(report, ui):
     return 'bash'
-'''
+''')
             f.close()
             _chk('apport-cli', 'coreutils', {'filebug': True, 'package': None,
                  'pid': None, 'crash_file': None, 'symptom': 'coreutils',
-                 'update_report': None, 'save': None})
-            _chk('apport-bug', 'coreutils', {'filebug': True, 'package': None,
-                 'pid': None, 'crash_file': None, 'symptom': 'coreutils',
-                 'update_report': None, 'save': None})
+                 'update_report': None, 'save': None, 'window': False, 
+                 'tag': []})
 
             # PID
             _chk('apport-cli', '1234', {'filebug': True, 'package': None,
                  'pid': '1234', 'crash_file': None, 'symptom': None,
-                 'update_report': None, 'save': None})
-            _chk('apport-bug', '1234', {'filebug': True, 'package': None,
-                 'pid': '1234', 'crash_file': None, 'symptom': None,
-                 'update_report': None, 'save': None})
+                 'update_report': None, 'save': None, 'window': False, 
+                 'tag': []})
 
             # .crash/.apport files; check correct handling of spaces
             for suffix in ('.crash', '.apport'):
-                for prog in ('apport-cli', 'apport-bug'):
-                    _chk(prog, '/tmp/f oo' + suffix, {'filebug': False,
-                         'package': None, 'pid': None, 
-                         'crash_file': '/tmp/f oo' + suffix, 'symptom': None,
-                         'update_report': None, 'save': None})
+                _chk('apport-cli', '/tmp/f oo' + suffix, {'filebug': False,
+                     'package': None, 'pid': None, 
+                     'crash_file': '/tmp/f oo' + suffix, 'symptom': None,
+                     'update_report': None, 'save': None, 'window': False, 
+                     'tag': []})
 
             # executable
             _chk('apport-cli', '/usr/bin/tail', {'filebug': True, 
                  'package': 'coreutils',
                  'pid': None, 'crash_file': None, 'symptom': None, 
-                 'update_report': None, 'save': None})
-            _chk('apport-bug', '/usr/bin/tail', {'filebug': True, 
-                 'package': 'coreutils',
-                 'pid': None, 'crash_file': None, 'symptom': None, 
-                 'update_report': None, 'save': None})
+                 'update_report': None, 'save': None, 'window': False, 
+                 'tag': []})
 
             # update existing report
             _chk('apport-collect', '1234', {'filebug': False, 'package': None,
-                 'crash_file': None, 'symptom': None, 'update_report': 1234})
+                 'crash_file': None, 'symptom': None, 'update_report': 1234,
+                 'tag': []})
             _chk('apport-update-bug', '1234', {'filebug': False, 'package': None,
-                 'crash_file': None, 'symptom': None, 'update_report': 1234})
+                 'crash_file': None, 'symptom': None, 'update_report': 1234,
+                 'tag': []})
+
+        def test_parse_argv_apport_bug(self):
+            '''parse_args() option inference when invoked as *-bug'''
+
+            def _chk(args, expected_opts):
+                sys.argv = ['apport-bug'] + args
+                orig_stderr = sys.stderr
+                sys.stderr = open('/dev/null', 'w')
+                try:
+                    ui = UserInterface()
+                finally:
+                    sys.stderr.close()
+                    sys.stderr = orig_stderr
+                expected_opts['version'] = None
+                self.assertEqual(ui.args, [])
+                self.assertEqual(ui.options, expected_opts)
+
+            #
+            # no arguments: default to 'ask for symptom' bug mode
+            #
+            _chk([], {'filebug': True, 'package': None,
+                'pid': None, 'crash_file': None, 'symptom': None, 
+                'update_report': None, 'save': None, 'window': False,
+                'tag': []})
+
+            #
+            # single arguments
+            #
+
+            # package
+            _chk(['coreutils'], {'filebug': True, 'package':
+                'coreutils', 'pid': None, 'crash_file': None, 'symptom': None, 
+                'update_report': None, 'save': None, 'window': False, 
+                'tag': []})
+
+            # symptom (preferred over package)
+            f = open(os.path.join(symptom_script_dir, 'coreutils.py'), 'w')
+            f.write('''description = 'foo does not work'
+def run(report, ui):
+    return 'bash'
+''')
+            f.close()
+            _chk(['coreutils'], {'filebug': True, 'package': None,
+                 'pid': None, 'crash_file': None, 'symptom': 'coreutils',
+                 'update_report': None, 'save': None, 'window': False, 
+                 'tag': []})
+            os.unlink(os.path.join(symptom_script_dir, 'coreutils.py'))
+
+            # PID
+            _chk(['1234'], {'filebug': True, 'package': None,
+                 'pid': '1234', 'crash_file': None, 'symptom': None,
+                 'update_report': None, 'save': None, 'window': False, 
+                 'tag': []})
+
+            # .crash/.apport files; check correct handling of spaces
+            for suffix in ('.crash', '.apport'):
+                _chk(['/tmp/f oo' + suffix], {'filebug': False,
+                     'package': None, 'pid': None, 
+                     'crash_file': '/tmp/f oo' + suffix, 'symptom': None,
+                     'update_report': None, 'save': None, 'window': False, 
+                     'tag': []})
+
+            # executable name
+            _chk(['/usr/bin/tail'], {'filebug': True, 'package': 'coreutils',
+                 'pid': None, 'crash_file': None, 'symptom': None, 
+                 'update_report': None, 'save': None, 'window': False, 
+                 'tag': []})
+
+            #
+            # supported options
+            #
+
+            # --save
+            _chk(['--save', 'foo.apport', 'coreutils'], {'filebug': True,
+                'package': 'coreutils', 'pid': None, 'crash_file': None,
+                'symptom': None, 'update_report': None, 'save': 'foo.apport',
+                'window': False, 'tag': []})
+
+            # --tag
+            _chk(['--tag', 'foo', 'coreutils'], {'filebug': True,
+                'package': 'coreutils', 'pid': None, 'crash_file': None,
+                'symptom': None, 'update_report': None, 'save': None,
+                'window': False, 'tag': ['foo']})
+            _chk(['--tag', 'foo', '--tag', 'bar', 'coreutils'], {
+                'filebug': True, 'package': 'coreutils', 'pid': None,
+                'crash_file': None, 'symptom': None, 'update_report': None,
+                'save': None, 'window': False, 'tag': ['foo', 'bar']})
 
     unittest.main()
 

=== modified file 'apport_python_hook.py'
--- apport_python_hook.py	2010-03-02 09:48:29 +0000
+++ apport_python_hook.py	2011-04-20 23:32:24 +0000
@@ -48,7 +48,11 @@
         if not enabled():
             return
 
-        from cStringIO import StringIO
+        try:
+            from cStringIO import StringIO
+        except ImportError:
+            from io import StringIO
+
         import re, tempfile, traceback
         from apport.fileutils import likely_packaged
 
@@ -102,7 +106,7 @@
                 # don't clobber existing report
                 return
         report_file = os.fdopen(os.open(pr_filename,
-            os.O_WRONLY|os.O_CREAT|os.O_EXCL, 0600), 'w')
+            os.O_WRONLY|os.O_CREAT|os.O_EXCL, 0o600), 'w')
         try:
             pr.write(report_file)
         finally:
@@ -154,15 +158,15 @@
 func(42)
 ''' % extracode)
                 os.close(fd)
-                os.chmod(script, 0755)
+                os.chmod(script, 0o755)
 
                 p = subprocess.Popen([script, 'testarg1', 'testarg2'],
                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 err = p.communicate()[1]
                 self.assertEqual(p.returncode, 1,
                     'crashing test python program exits with failure code')
-                self.assert_('Exception: This should happen.' in err)
-                self.failIf('OSError' in err, err)
+                self.assertTrue('Exception: This should happen.' in err)
+                self.assertFalse('OSError' in err, err)
             finally:
                 os.unlink(script)
 
@@ -179,7 +183,7 @@
             try:
                 self.assertEqual(len(reports), 1, 'crashed Python program produced a report')
                 self.assertEqual(stat.S_IMODE(os.stat(reports[0]).st_mode),
-                    0600, 'report has correct permissions')
+                    0o600, 'report has correct permissions')