[Python-modules-commits] r30009 - in packages/foolscap/trunk/debian (5 files)

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

    Date: Wednesday, July 30, 2014 @ 20:56:01
  Author: jtaylor-guest
Revision: 30009

promise.py-make-compatible-with-Twisted-14.0.0.patch

restore compatibilty with twisted (Closes: #755339)

Added:
  packages/foolscap/trunk/debian/patches/promise.py-make-compatible-with-Twisted-14.0.0.patch
Modified:
  packages/foolscap/trunk/debian/changelog
  packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch
  packages/foolscap/trunk/debian/patches/series
  packages/foolscap/trunk/debian/patches/twisted-13-compat.patch

Modified: packages/foolscap/trunk/debian/changelog
===================================================================
--- packages/foolscap/trunk/debian/changelog	2014-07-30 18:48:21 UTC (rev 30008)
+++ packages/foolscap/trunk/debian/changelog	2014-07-30 20:56:01 UTC (rev 30009)
@@ -1,3 +1,10 @@
+foolscap (0.6.4-3) unstable; urgency=medium
+
+  * promise.py-make-compatible-with-Twisted-14.0.0.patch:
+    restore compatibility with twisted (Closes: #755339)
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 30 Jul 2014 22:47:24 +0200
+
 foolscap (0.6.4-2) unstable; urgency=low
 
   [ Julian Taylor ]

Modified: packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch
===================================================================
--- packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch	2014-07-30 18:48:21 UTC (rev 30008)
+++ packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch	2014-07-30 20:56:01 UTC (rev 30009)
@@ -3,7 +3,7 @@
 Forwarded: not-needed
 --- a/setup.py
 +++ b/setup.py
-@@ -71,7 +71,9 @@
+@@ -71,7 +71,9 @@ if have_setuptools:
              "flappserver = foolscap.appserver.cli:run_flappserver",
              "flappclient = foolscap.appserver.client:run_flappclient",
              ] }

Added: packages/foolscap/trunk/debian/patches/promise.py-make-compatible-with-Twisted-14.0.0.patch
===================================================================
--- packages/foolscap/trunk/debian/patches/promise.py-make-compatible-with-Twisted-14.0.0.patch	                        (rev 0)
+++ packages/foolscap/trunk/debian/patches/promise.py-make-compatible-with-Twisted-14.0.0.patch	2014-07-30 20:56:01 UTC (rev 30009)
@@ -0,0 +1,22 @@
+Origin: 2eeabc61c2573652d7482d039644d62d782c2e3a
+From: Brian Warner <warner at lothar.com>
+Date: Fri, 27 Jun 2014 12:38:42 -0700
+Description: promise.py: make compatible with Twisted-14.0.0
+
+twisted.python.util.unsignedID was removed in Twisted-14.0.0 . We used
+it to handle very old pythons (py2.4/py2.5) in which id() sometimes
+returned a negative number. This only affects the cosmetic repr() of a
+Promise, so this probably doesn't affect 2.4/2.5 compatibility (which is
+currently untested).
+
+--- a/foolscap/promise.py
++++ b/foolscap/promise.py
+@@ -5,8 +5,6 @@ from twisted.python.failure import Failu
+ from twisted.internet import defer
+ from foolscap.eventual import eventually
+ 
+-id = util.unsignedID
+-
+ EVENTUAL, CHAINED, NEAR, BROKEN = range(4)
+ 
+ class UsageError(Exception):

Modified: packages/foolscap/trunk/debian/patches/series
===================================================================
--- packages/foolscap/trunk/debian/patches/series	2014-07-30 18:48:21 UTC (rev 30008)
+++ packages/foolscap/trunk/debian/patches/series	2014-07-30 20:56:01 UTC (rev 30009)
@@ -1,2 +1,3 @@
 minimal_twisted_deps.patch
 twisted-13-compat.patch
+promise.py-make-compatible-with-Twisted-14.0.0.patch

Modified: packages/foolscap/trunk/debian/patches/twisted-13-compat.patch
===================================================================
--- packages/foolscap/trunk/debian/patches/twisted-13-compat.patch	2014-07-30 18:48:21 UTC (rev 30008)
+++ packages/foolscap/trunk/debian/patches/twisted-13-compat.patch	2014-07-30 20:56:01 UTC (rev 30009)
@@ -1,8 +1,8 @@
 Description: twisted 13 removed _parse
 Origin: https://github.com/warner/foolscap/pull/14
---- foolscap-0.6.4.orig/foolscap/test/test_negotiate.py 2012-06-19 02:26:57.000000000 +0000
-+++ foolscap-0.6.4/foolscap/test/test_negotiate.py      2014-01-18 16:05:39.207868118 +0000
-@@ -3,6 +3,7 @@
+--- a/foolscap/test/test_negotiate.py
++++ b/foolscap/test/test_negotiate.py
+@@ -3,6 +3,7 @@ from twisted.trial import unittest
  
  from twisted.internet import protocol, defer, reactor
  from twisted.application import internet
@@ -10,7 +10,7 @@
  from foolscap import pb, negotiate, tokens, eventual
  from foolscap.api import Referenceable, Tub, UnauthenticatedTub, BananaError
  from foolscap.eventual import flushEventualQueue
-@@ -75,20 +76,6 @@
+@@ -75,20 +76,6 @@ class Target(Referenceable):
          self.calls += 1
  
  
@@ -31,4 +31,3 @@
  class OneTimeDeferred(defer.Deferred):
      def callback(self, res):
          if self.called:
-