Merge lp:~mvo/aptdaemon/exception-fixes into lp:aptdaemon

[Michael Vogt]

Be more py3 friendly when it comes to exception handling. I also think the new synatx is cleaner to read. This is supported since python 2.6 (see http://docs.python.org/whatsnew/2.6.html see pep3110).

Patch is not complete, but if you like the aporoach I will make it complete.

=== modified file 'aptdaemon/worker.py'
--- aptdaemon/worker.py	2011-11-24 16:20:11 +0000
+++ aptdaemon/worker.py	2011-11-24 16:26:26 +0000
@@ -153,7 +153,7 @@
             log.debug("Calling %s plugin: %s", name, plugin)
             try:
                 plugin(resolver, self._cache)
-            except Exception, error:
+            except Exception as error:
                 log.critical("Failed to call %s plugin:\n%s" % (plugin, error))
         return True
 
@@ -254,7 +254,7 @@
             trans.exit = EXIT_FAILED
         except (KeyboardInterrupt, SystemExit):
             trans.exit = EXIT_CANCELLED
-        except Exception, excep:
+        except Exception as excep:
             tbk = traceback.format_exc()
             trans.error = TransactionFailed(ERROR_UNKNOWN, tbk)
             trans.exit = EXIT_FAILED
@@ -460,7 +460,7 @@
                 import grp
                 try:
                     os.chown(sourcesfile, 0, grp.getgrnam("admin")[2])
-                except Exception, e:
+                except Exception as e:
                     logging.warn("os.chmod() failed '%s'" % e)
         finally:
             os.umask(old_umask)
@@ -517,7 +517,7 @@
             #FIXME: use --dry-run before?
             auth = AptAuth()
             auth.add(os.path.expanduser(path))
-        except Exception, error:
+        except Exception as error:
             raise TransactionFailed(ERROR_KEY_NOT_INSTALLED,
                                     _("Key file %s couldn't be installed: %s"),
                                     path, error)
@@ -537,7 +537,7 @@
             #FIXME: use --dry-run before?
             auth = AptAuth()
             auth.rm(fingerprint)
-        except Exception, error:
+        except Exception as error:
             raise TransactionFailed(ERROR_KEY_NOT_REMOVED,
                                     _("Key with fingerprint %s couldn't be "
                                       "removed: %s"), fingerprint, error)
@@ -780,7 +780,7 @@
                 sources_list = os.path.join(basedir, sources_list)
         try:
             self._cache.update(progress, sources_list=sources_list)
-        except apt.cache.FetchFailedException, error:
+        except apt.cache.FetchFailedException as error:
             # ListUpdate() method of apt handles a cancelled operation
             # as a failed one, see LP #162441
             if trans.cancelled:
@@ -892,7 +892,7 @@
                 self._cache = apt.cache.Cache(progress)
             else:
                 self._cache.open(progress)
-        except SystemError, excep:
+        except SystemError as excep:
             raise TransactionFailed(ERROR_NO_CACHE, excep.message)
 
     def is_dpkg_journal_clean(self):
@@ -943,12 +943,12 @@
         with self._frozen_status():
             try:
                 self._cache.commit(fetch_progress, inst_progress)
-            except apt.cache.FetchFailedException, error:
+            except apt.cache.FetchFailedException as error:
                 raise TransactionFailed(ERROR_PACKAGE_DOWNLOAD_FAILED,
                                         str(error.message))
             except apt.cache.FetchCancelledException:
                 raise TransactionCancelled()
-            except SystemError, excep:
+            except SystemError as excep:
                 # Run dpkg --configure -a to recover from a failed transaction
                 trans.status = STATUS_CLEANING_UP
                 progress = DaemonDpkgRecoverProgress(trans, begin=90, end=95)
@@ -997,10 +997,10 @@
         try:
             trans.depends, trans.download, trans.space, \
                     trans.unauthenticated = self.__simulate(trans)
-        except TransactionFailed, excep:
+        except TransactionFailed as excep:
             trans.error = excep
             trans.exit = EXIT_FAILED
-        except Exception, excep:
+        except Exception as excep:
             tbk = traceback.format_exc()
             trans.error = TransactionFailed(ERROR_UNKNOWN, tbk)
             try:
@@ -1177,7 +1177,7 @@
             deb = apt.debfile.DebPackage(path, self._cache)
         except IOError:
             raise TransactionFailed(ERROR_UNREADABLE_PACKAGE_FILE, path)
-        except Exception, error:
+        except Exception as error:
             raise TransactionFailed(ERROR_INVALID_PACKAGE_FILE, str(error))
         if not deb.check():
             raise TransactionFailed(ERROR_DEP_RESOLUTION_FAILED,
@@ -1217,7 +1217,8 @@
             license_key, license_key_path = \
                     self.plugins["get_license_key"][0](trans.uid, pkg_name,
                                                        json_token, server_name)
-        except Exception, error:
+        except Exception as error:
+            logging.exception("get_license_key plugin failed")
             raise TransactionFailed(ERROR_LICENSE_KEY_DOWNLOAD_FAILED,
                                     str(error))
         # ensure stuff is good

=== modified file 'gtk-demo.py'
--- gtk-demo.py	2010-12-06 05:10:53 +0000
+++ gtk-demo.py	2011-11-24 16:26:26 +0000
@@ -68,7 +68,7 @@
             return
         except aptdaemon.errors.TransactionFailed, error:
             pass
-        except Exception, error:
+        except Exception as error:
             error = aptdaemon.errors.TransactionFailed(ERROR_UNKNOWN,
                                                        str(error))
         dia = AptErrorDialog(error)

=== modified file 'gtk3-demo.py'
--- gtk3-demo.py	2011-08-17 05:33:59 +0000
+++ gtk3-demo.py	2011-11-24 16:26:26 +0000
@@ -73,7 +73,7 @@
             return
         except aptdaemon.errors.TransactionFailed, error:
             pass
-        except Exception, error:
+        except Exception as error:
             error = aptdaemon.errors.TransactionFailed(ERROR_UNKNOWN,
                                                        str(error))
         dia = AptErrorDialog(error)