[Python-modules-commits] r27293 - in packages/foolscap/trunk/debian (3 files)

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

    Date: Saturday, January 18, 2014 @ 16:25:52
  Author: jtaylor-guest
Revision: 27293

twisted-13-compat.patch: fix broken test with twisted 13 (Closes:#735788)

Added:
  packages/foolscap/trunk/debian/patches/twisted-13-compat.patch
Modified:
  packages/foolscap/trunk/debian/changelog
  packages/foolscap/trunk/debian/patches/series

Modified: packages/foolscap/trunk/debian/changelog
===================================================================
--- packages/foolscap/trunk/debian/changelog	2014-01-18 15:25:54 UTC (rev 27292)
+++ packages/foolscap/trunk/debian/changelog	2014-01-18 16:25:52 UTC (rev 27293)
@@ -1,12 +1,13 @@
-foolscap (0.6.4-2) UNRELEASED; urgency=low
+foolscap (0.6.4-2) unstable; urgency=low
 
   [ Julian Taylor ]
   * add autopkgtests
+  * twisted-13-compat.patch: fix broken test with twisted 13 (Closes:#735788)
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:00:54 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 18 Jan 2014 17:09:16 +0100
 
 foolscap (0.6.4-1) unstable; urgency=low
 

Modified: packages/foolscap/trunk/debian/patches/series
===================================================================
--- packages/foolscap/trunk/debian/patches/series	2014-01-18 15:25:54 UTC (rev 27292)
+++ packages/foolscap/trunk/debian/patches/series	2014-01-18 16:25:52 UTC (rev 27293)
@@ -1 +1,2 @@
 minimal_twisted_deps.patch
+twisted-13-compat.patch

Added: packages/foolscap/trunk/debian/patches/twisted-13-compat.patch
===================================================================
--- packages/foolscap/trunk/debian/patches/twisted-13-compat.patch	                        (rev 0)
+++ packages/foolscap/trunk/debian/patches/twisted-13-compat.patch	2014-01-18 16:25:52 UTC (rev 27293)
@@ -0,0 +1,34 @@
+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 @@
+ 
+ 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 @@
+         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:
+