[Python-modules-commits] r30291 - in packages/foolscap/trunk/debian (4 files)

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

    Date: Wednesday, August 27, 2014 @ 18:17:40
  Author: jtaylor-guest
Revision: 30291

remove upstream applied

- promise.py-make-compatible-with-Twisted-14.0.0.patch
- twisted-13-compat.patch

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

Modified: packages/foolscap/trunk/debian/changelog
===================================================================
--- packages/foolscap/trunk/debian/changelog	2014-08-27 18:17:37 UTC (rev 30290)
+++ packages/foolscap/trunk/debian/changelog	2014-08-27 18:17:40 UTC (rev 30291)
@@ -1,6 +1,9 @@
 foolscap (0.6.5-1) unstable; urgency=medium
 
   * New upstream release
+  * remove upstream applied
+    - promise.py-make-compatible-with-Twisted-14.0.0.patch 
+    - twisted-13-compat.patch
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 27 Aug 2014 20:07:55 +0200
 

Deleted: 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	2014-08-27 18:17:37 UTC (rev 30290)
+++ packages/foolscap/trunk/debian/patches/promise.py-make-compatible-with-Twisted-14.0.0.patch	2014-08-27 18:17:40 UTC (rev 30291)
@@ -1,22 +0,0 @@
-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-08-27 18:17:37 UTC (rev 30290)
+++ packages/foolscap/trunk/debian/patches/series	2014-08-27 18:17:40 UTC (rev 30291)
@@ -1,3 +1 @@
 minimal_twisted_deps.patch
-twisted-13-compat.patch
-promise.py-make-compatible-with-Twisted-14.0.0.patch

Deleted: packages/foolscap/trunk/debian/patches/twisted-13-compat.patch
===================================================================
--- packages/foolscap/trunk/debian/patches/twisted-13-compat.patch	2014-08-27 18:17:37 UTC (rev 30290)
+++ packages/foolscap/trunk/debian/patches/twisted-13-compat.patch	2014-08-27 18:17:40 UTC (rev 30291)
@@ -1,33 +0,0 @@
-Description: twisted 13 removed _parse
-Origin: https://github.com/warner/foolscap/pull/14
---- 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
-+from twisted.web.client import getPage
- from foolscap import pb, negotiate, tokens, eventual
- from foolscap.api import Referenceable, Tub, UnauthenticatedTub, BananaError
- from foolscap.eventual import flushEventualQueue
-@@ -75,20 +76,6 @@ class Target(Referenceable):
-         self.calls += 1
- 
- 
--def getPage(url):
--    """This is a variant of the standard twisted.web.client.getPage, which is
--    smart enough to shut off its connection when its done (even if it fails).
--    """
--    from twisted.web import client
--    scheme, host, port, path = client._parse(url)
--    factory = client.HTTPClientFactory(url)
--    c = reactor.connectTCP(host, port, factory)
--    def shutdown(res, c):
--        c.disconnect()
--        return res
--    factory.deferred.addBoth(shutdown, c)
--    return factory.deferred
--
- class OneTimeDeferred(defer.Deferred):
-     def callback(self, res):
-         if self.called: