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

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

    Date: Thursday, June 13, 2013 @ 12:02:56
  Author: mitya57-guest
Revision: 24798

* Add fix-importkiller.patch to fix the testsuite failures with Python 3
* Make the conversion script actually working, and install it to /usr/share/python-keyring

Added:
  packages/python-keyring/trunk/debian/patches/fix-importkiller.patch
Modified:
  packages/python-keyring/trunk/debian/NEWS
  packages/python-keyring/trunk/debian/changelog
  packages/python-keyring/trunk/debian/convert-crypto-keyring
  packages/python-keyring/trunk/debian/patches/series
  packages/python-keyring/trunk/debian/python-keyring.install

Modified: packages/python-keyring/trunk/debian/NEWS
===================================================================
--- packages/python-keyring/trunk/debian/NEWS	2013-06-13 11:48:56 UTC (rev 24797)
+++ packages/python-keyring/trunk/debian/NEWS	2013-06-13 12:02:56 UTC (rev 24798)
@@ -3,8 +3,9 @@
   * This version no longer supports conversion of pre-0.9 Crypto-based
     keyring files. Version in wheezy (0.7.1-1+deb7u1) automatically
     converts these files when you use it, so if you were using
-    python-keyring in wheezy, you are not affected. Otherwise, if you
-    used Crypto backend, you should convert these files manually using
-    /usr/bin/convert-crypto-keyring script from python-keyring package.
+    python-keyring in wheezy, you are not affected.
+    Otherwise, if you used Crypto backend, you should convert these files
+    manually using /usr/share/python-keyring/convert-crypto-keyring
+    script from python-keyring package.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 10 Jun 2013 11:49:16 +0400

Modified: packages/python-keyring/trunk/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog	2013-06-13 11:48:56 UTC (rev 24797)
+++ packages/python-keyring/trunk/debian/changelog	2013-06-13 12:02:56 UTC (rev 24798)
@@ -17,6 +17,8 @@
   * Drop all previous patches, applied upstream.
   * debian/patches/no-pytest-runner.patch: do not require pytest-runner,
     it is not in Debian.
+  * debian/patches/fix-importkiller.patch: fix ImportKiller not working
+    with Python 3.x (fixes the testsuite).
   * Bump Standards-Version to 3.9.4 and debhelper compat level to 9.
   * Disable HTTP traffic in debian/rules.
   * Run upstream testsuite during build; simplify other debian/rules parts.

Modified: packages/python-keyring/trunk/debian/convert-crypto-keyring
===================================================================
--- packages/python-keyring/trunk/debian/convert-crypto-keyring	2013-06-13 11:48:56 UTC (rev 24797)
+++ packages/python-keyring/trunk/debian/convert-crypto-keyring	2013-06-13 12:02:56 UTC (rev 24798)
@@ -34,9 +34,10 @@
 config.read(file_path)
 config.get(KEYRING_SETTING, CRYPTED_PASSWORD)
 
-keyring = EncryptedKeyring(file_path)
+keyring = EncryptedKeyring()
+keyring.file_path = file_path
 keyring_password = getpass.getpass(
-    "Please input your password for the keyring: ")
+    "Please enter your password for the old keyring: ")
 
 hashed = crypt.crypt(keyring_password, keyring_password)
 if config.get(KEYRING_SETTING, CRYPTED_PASSWORD) != hashed:

Added: packages/python-keyring/trunk/debian/patches/fix-importkiller.patch
===================================================================
--- packages/python-keyring/trunk/debian/patches/fix-importkiller.patch	                        (rev 0)
+++ packages/python-keyring/trunk/debian/patches/fix-importkiller.patch	2013-06-13 12:02:56 UTC (rev 24798)
@@ -0,0 +1,16 @@
+Description: fix ImportKiller not working in Python 3.x
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: yes, https://bitbucket.org/kang/python-keyring-lib/pull-request/31/
+Last-Update: 2013-06-13
+
+--- a/keyring/tests/util.py
++++ b/keyring/tests/util.py
+@@ -18,7 +18,7 @@
+         self.original = {}
+         for name in self.names:
+             self.original[name] = sys.modules.pop(name, None)
+-        sys.meta_path.append(self)
++        sys.meta_path.insert(0, self)
+     def __exit__(self, *args):
+         sys.meta_path.remove(self)
+         for key, value in self.original.items():

Modified: packages/python-keyring/trunk/debian/patches/series
===================================================================
--- packages/python-keyring/trunk/debian/patches/series	2013-06-13 11:48:56 UTC (rev 24797)
+++ packages/python-keyring/trunk/debian/patches/series	2013-06-13 12:02:56 UTC (rev 24798)
@@ -1 +1,2 @@
 no-pytest-runner.patch
+fix-importkiller.patch

Modified: packages/python-keyring/trunk/debian/python-keyring.install
===================================================================
--- packages/python-keyring/trunk/debian/python-keyring.install	2013-06-13 11:48:56 UTC (rev 24797)
+++ packages/python-keyring/trunk/debian/python-keyring.install	2013-06-13 12:02:56 UTC (rev 24798)
@@ -1,2 +1,2 @@
 usr/lib/python2*
-debian/convert-crypto-keyring usr/bin/
+debian/convert-crypto-keyring usr/share/python-keyring/