From: Brian Warner <warner@lothar.com>
Date: Wed, 3 Sep 2014 01:22:59 +0000 (-0700)
Subject: check_memory: stop using long-deprecated twisted internals
X-Git-Tag: allmydata-tahoe-1.10.1a1~150
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/biz/?a=commitdiff_plain;h=58b66b4018318ab3aa02bbc9e80a25e27036a7cb;p=tahoe-lafs%2Ftahoe-lafs.git

check_memory: stop using long-deprecated twisted internals
---

diff --git a/src/allmydata/test/check_memory.py b/src/allmydata/test/check_memory.py
index ce6b33a7..2cca8112 100644
--- a/src/allmydata/test/check_memory.py
+++ b/src/allmydata/test/check_memory.py
@@ -1,4 +1,4 @@
-import os, shutil, sys, urllib, time, stat
+import os, shutil, sys, urllib, time, stat, urlparse
 from cStringIO import StringIO
 from twisted.internet import defer, reactor, protocol, error
 from twisted.application import service, internet
@@ -49,10 +49,14 @@ def discardPage(url, stall=False, *args, **kwargs):
     # adapted from twisted.web.client.getPage . We can't just wrap or
     # subclass because it provides no way to override the HTTPClientFactory
     # that it creates.
-    scheme, host, port, path = tw_client._parse(url)
+    scheme, netloc, path, params, query, fragment = urlparse.urlparse(url)
+    assert scheme == 'http'
+    host, port = netloc, 80
+    if ":" in host:
+        host, port = host.split(":")
+        port = int(port)
     factory = StallableDiscardingHTTPClientFactory(url, *args, **kwargs)
     factory.do_stall = stall
-    assert scheme == 'http'
     reactor.connectTCP(host, port, factory)
     return factory.deferred