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

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

    Date: Sunday, June 23, 2013 @ 16:57:46
  Author: mitya57-guest
Revision: 24926

* New upstream release.
* Drop fix-importkiller.patch, applied upstream.

Modified:
  packages/python-keyring/trunk/debian/changelog
  packages/python-keyring/trunk/debian/patches/series
Deleted:
  packages/python-keyring/trunk/debian/patches/fix-importkiller.patch

Modified: packages/python-keyring/trunk/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog	2013-06-23 15:09:13 UTC (rev 24925)
+++ packages/python-keyring/trunk/debian/changelog	2013-06-23 16:57:46 UTC (rev 24926)
@@ -1,3 +1,10 @@
+python-keyring (1.5-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Drop fix-importkiller.patch, applied upstream.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Sun, 23 Jun 2013 20:51:53 +0400
+
 python-keyring (1.4-1) unstable; urgency=low
 
   * Team upload.

Deleted: packages/python-keyring/trunk/debian/patches/fix-importkiller.patch
===================================================================
--- packages/python-keyring/trunk/debian/patches/fix-importkiller.patch	2013-06-23 15:09:13 UTC (rev 24925)
+++ packages/python-keyring/trunk/debian/patches/fix-importkiller.patch	2013-06-23 16:57:46 UTC (rev 24926)
@@ -1,16 +0,0 @@
-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-23 15:09:13 UTC (rev 24925)
+++ packages/python-keyring/trunk/debian/patches/series	2013-06-23 16:57:46 UTC (rev 24926)
@@ -1,3 +1,2 @@
 no-pytest-runner.patch
-fix-importkiller.patch
 catch-dbus-errors.patch