[Python-modules-commits] r27563 - in packages/enum34/trunk/debian (3 files)

[barry at users.alioth.debian.org]

    Date: Friday, February 7, 2014 @ 15:44:13
  Author: barry
Revision: 27563

* New upstream release.
* d/patches/python3r-fixes.patch: Removed; fixed upstream.

Modified:
  packages/enum34/trunk/debian/changelog
  packages/enum34/trunk/debian/patches/series
Deleted:
  packages/enum34/trunk/debian/patches/python34-fixes.patch

Modified: packages/enum34/trunk/debian/changelog
===================================================================
--- packages/enum34/trunk/debian/changelog	2014-02-06 22:21:34 UTC (rev 27562)
+++ packages/enum34/trunk/debian/changelog	2014-02-07 15:44:13 UTC (rev 27563)
@@ -1,3 +1,10 @@
+enum34 (0.9.21-1) unstable; urgency=medium
+
+  * New upstream release.
+  * d/patches/python3r-fixes.patch: Removed; fixed upstream.
+
+ -- Barry Warsaw <barry at debian.org>  Fri, 07 Feb 2014 10:33:28 -0500
+
 enum34 (0.9.20-1) unstable; urgency=medium
 
   * New upstream release.

Deleted: packages/enum34/trunk/debian/patches/python34-fixes.patch
===================================================================
--- packages/enum34/trunk/debian/patches/python34-fixes.patch	2014-02-06 22:21:34 UTC (rev 27562)
+++ packages/enum34/trunk/debian/patches/python34-fixes.patch	2014-02-07 15:44:13 UTC (rev 27563)
@@ -1,48 +0,0 @@
-Description: Fix some test failures under Python 3.4 (and at least one under
-  3.3).  Python 3.4's highest pickle protocol cannot pickle the nested enums,
-  so there, use protocol 3 (i.e. the highest protocol under Python <= 3.3).
-  Also, add a required symbol to locals for exec().
-Author: Barry Warsaw <barry at debian.org>
-Bug: https://bitbucket.org/stoneleaf/enum34/issue/3/build-failures-in-python-34-and-33-in
-
---- a/enum/test_enum.py
-+++ b/enum/test_enum.py
-@@ -6,6 +6,8 @@
- 
- pyver = float('%s.%s' % sys.version_info[:2])
- 
-+SAFE_PROTOCOL = HIGHEST_PROTOCOL - (0 if pyver <= 3.3 else 1)
-+
- try:
-     any
- except NameError:
-@@ -366,7 +368,7 @@
- 
-     if pyver >= 3.0:
-         cls = vars()
--        result = {}
-+        result = dict(Enum=Enum)
-         exec("""def test_duplicate_name(self):
-             with self.assertRaises(TypeError):
-                 class Color(Enum):
-@@ -1019,9 +1021,9 @@
-         globals()['NEI'] = NEI
-         NI5 = NamedInt('test', 5)
-         self.assertEqual(NI5, 5)
--        self.assertEqual(loads(dumps(NI5, protocol=HIGHEST_PROTOCOL)), 5)
-+        self.assertEqual(loads(dumps(NI5, protocol=SAFE_PROTOCOL)), 5)
-         self.assertEqual(NEI.y.value, 2)
--        self.assertTrue(loads(dumps(NEI.y, protocol=HIGHEST_PROTOCOL)) is NEI.y)
-+        self.assertTrue(loads(dumps(NEI.y, protocol=SAFE_PROTOCOL)) is NEI.y)
- 
-     def test_subclasses_without_getnewargs(self):
-         class NamedInt(int):
-@@ -1097,7 +1099,7 @@
-         self.assertTrue(isinstance(SomeTuple.second, tuple))
-         self.assertEqual(SomeTuple.third, (3, 'for the music'))
-         globals()['SomeTuple'] = SomeTuple
--        self.assertTrue(loads(dumps(SomeTuple.first, protocol=HIGHEST_PROTOCOL)) is SomeTuple.first)
-+        self.assertTrue(loads(dumps(SomeTuple.first, protocol=SAFE_PROTOCOL)) is SomeTuple.first)
- 
-     def test_duplicate_values_give_unique_enum_items(self):
-         class AutoNumber(Enum):

Modified: packages/enum34/trunk/debian/patches/series
===================================================================
--- packages/enum34/trunk/debian/patches/series	2014-02-06 22:21:34 UTC (rev 27562)
+++ packages/enum34/trunk/debian/patches/series	2014-02-07 15:44:13 UTC (rev 27563)
@@ -1 +0,0 @@
-python34-fixes.patch