[Python-modules-commits] r25703 - in packages/python-keyring/trunk/debian (2 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Saturday, August 31, 2013 @ 09:36:49
  Author: mitya57-guest
Revision: 25703

Refresh catch-dbus-errors.patch.

Modified:
  packages/python-keyring/trunk/debian/changelog
  packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch

Modified: packages/python-keyring/trunk/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog	2013-08-30 14:53:12 UTC (rev 25702)
+++ packages/python-keyring/trunk/debian/changelog	2013-08-31 09:36:49 UTC (rev 25703)
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Drop no-pytest-runner.patch, applied upstream.
+  * Refresh catch-dbus-errors.patch.
   * Switch debian/watch to use HTTPS.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Wed, 07 Aug 2013 18:56:32 +0400

Modified: packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch
===================================================================
--- packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch	2013-08-30 14:53:12 UTC (rev 25702)
+++ packages/python-keyring/trunk/debian/patches/catch-dbus-errors.patch	2013-08-31 09:36:49 UTC (rev 25703)
@@ -1,23 +1,17 @@
 Description: catch D-Bus errors when checking if SecretService is supported
 Author: Dmitry Shachnev <mitya57 at gmail.com>
 Forwarded: no
-Last-Update: 2013-06-21
+Last-Update: 2013-08-31
 
 --- a/keyring/backends/SecretService.py
 +++ b/keyring/backends/SecretService.py
-@@ -14,10 +14,14 @@
-         except ImportError:
-             return -1
-         from secretstorage.exceptions import SecretServiceNotAvailableException
-+        try:
-+            from dbus.exceptions import DBusException
-+        except ImportError:
-+            return -1
+@@ -26,7 +26,8 @@
          try:
              bus = secretstorage.dbus_init()
              secretstorage.Collection(bus)
--        except (ImportError, SecretServiceNotAvailableException):
-+        except (ImportError, SecretServiceNotAvailableException, DBusException):
-             return -1
-         else:
-             return 1
+-        except secretstorage.exceptions.SecretServiceNotAvailableException:
++        from dbus.exceptions import DBusException
++        except (secretstorage.exceptions.SecretServiceNotAvailableException, DBusException):
+             raise RuntimeError("Unable to get initialize SecretService")
+         if 'DISPLAY' not in os.environ:
+             raise RuntimeError("SecretService cannot run without a DISPLAY "