[Python-modules-commits] r25515 - in packages/python-axiom/trunk/debian (4 files)

[mithrandi at users.alioth.debian.org]

    Date: Sunday, August 11, 2013 @ 20:22:06
  Author: mithrandi
Revision: 25515

Remove MetaItem comparison methods patch (this was fixed in CPython
itself, see <http://bugs.python.org/issue7491>).

Modified:
  packages/python-axiom/trunk/debian/changelog
  packages/python-axiom/trunk/debian/control
  packages/python-axiom/trunk/debian/patches/series
Deleted:
  packages/python-axiom/trunk/debian/patches/python2.6.diff

Modified: packages/python-axiom/trunk/debian/changelog
===================================================================
--- packages/python-axiom/trunk/debian/changelog	2013-08-11 17:22:46 UTC (rev 25514)
+++ packages/python-axiom/trunk/debian/changelog	2013-08-11 20:22:06 UTC (rev 25515)
@@ -1,6 +1,8 @@
 python-axiom (0.6.0-5) UNRELEASED; urgency=low
 
   * Remove _trial_temp in clean target. (Closes: #671096)
+  * Remove MetaItem comparison methods patch (this was fixed in CPython
+    itself, see <http://bugs.python.org/issue7491>).
 
  -- Tristan Seligmann <mithrandi at debian.org>  Sun, 11 Aug 2013 07:45:02 +0200
 

Modified: packages/python-axiom/trunk/debian/control
===================================================================
--- packages/python-axiom/trunk/debian/control	2013-08-11 17:22:46 UTC (rev 25514)
+++ packages/python-axiom/trunk/debian/control	2013-08-11 20:22:06 UTC (rev 25515)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Tristan Seligmann <mithrandi at debian.org>, Vincent Bernat <bernat at debian.org>
-Build-Depends: debhelper (>= 6), cdbs (>= 0.4.90~), python-all (>= 2.6.6-3~), python-epsilon (>= 0.6.0-2~)
+Build-Depends: debhelper (>= 6), cdbs (>= 0.4.90~), python-all (>= 2.7~), python-epsilon (>= 0.6.0-2~)
 Build-Depends-Indep: python-twisted-core, python-twisted-conch, python-pysqlite2, python-zopeinterface
 Homepage: https://launchpad.net/divmod-axiom
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-axiom/trunk/

Deleted: packages/python-axiom/trunk/debian/patches/python2.6.diff
===================================================================
--- packages/python-axiom/trunk/debian/patches/python2.6.diff	2013-08-11 17:22:46 UTC (rev 25514)
+++ packages/python-axiom/trunk/debian/patches/python2.6.diff	2013-08-11 20:22:06 UTC (rev 25515)
@@ -1,46 +0,0 @@
-Description:
-  In Python 2.6, the `type` object defines __lt__, __gt__ etc. methods, so it's
-  not enough to provide own __cmp__ method to override all comparison operators.
-Author: Jakub Wilk <ubanus at users.sf.net>
-
-Index: python-axiom-0.6.0/axiom/item.py
-===================================================================
---- python-axiom-0.6.0.orig/axiom/item.py	2010-01-14 14:42:26.000000000 +0100
-+++ python-axiom-0.6.0/axiom/item.py	2010-01-14 14:42:58.000000000 +0100
-@@ -101,6 +101,36 @@
-                        (other.typeName, other.schemaVersion))
-         return NotImplemented
- 
-+    def __lt__(self, other):
-+        if isinstance(other, MetaItem):
-+            return (self.typeName, self.schemaVersion) < (other.typeName, other.schemaVersion)
-+        return NotImplemented
-+
-+    def __gt__(self, other):
-+        if isinstance(other, MetaItem):
-+            return (self.typeName, self.schemaVersion) > (other.typeName, other.schemaVersion)
-+        return NotImplemented
-+
-+    def __le__(self, other):
-+        if isinstance(other, MetaItem):
-+            return (self.typeName, self.schemaVersion) <= (other.typeName, other.schemaVersion)
-+        return NotImplemented
-+
-+    def __ge__(self, other):
-+        if isinstance(other, MetaItem):
-+            return (self.typeName, self.schemaVersion) >= (other.typeName, other.schemaVersion)
-+        return NotImplemented
-+
-+    def __eq__(self, other):
-+        if isinstance(other, MetaItem):
-+            return (self.typeName, self.schemaVersion) == (other.typeName, other.schemaVersion)
-+        return NotImplemented
-+
-+    def __ne__(self, other):
-+        if isinstance(other, MetaItem):
-+            return (self.typeName, self.schemaVersion) != (other.typeName, other.schemaVersion)
-+        return NotImplemented
-+
- 
- def noop():
-     pass

Modified: packages/python-axiom/trunk/debian/patches/series
===================================================================
--- packages/python-axiom/trunk/debian/patches/series	2013-08-11 17:22:46 UTC (rev 25514)
+++ packages/python-axiom/trunk/debian/patches/series	2013-08-11 20:22:06 UTC (rev 25515)
@@ -1,2 +1 @@
-python2.6.diff
 1209082-remove-bogus-performance-tests.diff