remove that queen_host stuff

diff --git a/allmydata/client.py b/allmydata/client.py
index 3a3b38828006819899f7b18063e5bec37bd5a776..3199f192cccbad18e89ead03dbf7f2eb02ef0068 100644 (file)
--- a/allmydata/client.py
+++ b/allmydata/client.py
@@ -15,9 +15,8 @@ class Storage(service.MultiService, Referenceable):
 class Client(service.MultiService):
     CERTFILE = "client.pem"
 
-    def __init__(self, queen_host, queen_pburl):
+    def __init__(self, queen_pburl):
         service.MultiService.__init__(self)
-        self.queen_host = queen_host
         self.queen_pburl = queen_pburl
         if os.path.exists(self.CERTFILE):
             self.tub = Tub(certData=open(self.CERTFILE, "rb").read())
@@ -41,7 +40,7 @@ class Client(service.MultiService):
     def startService(self):
         # note: this class can only be started and stopped once.
         service.MultiService.startService(self)
-        d = get_local_ip_for(self.queen_host)
+        d = get_local_ip_for()
         d.addCallback(self._setup_services)
         if self.queen_pburl:
             self.connector = self.tub.connectTo(self.queen_pburl,

diff --git a/allmydata/test/test_client.py b/allmydata/test/test_client.py
index 1c1c662dbcc74584b2c37185a425acb489ad7210..d80eb30882771e06f21c4fc2454eff739a1c0697 100644 (file)
--- a/allmydata/test/test_client.py
+++ b/allmydata/test/test_client.py
@@ -5,7 +5,7 @@ from allmydata import client
 
 class Basic(unittest.TestCase):
     def testLoadable(self):
-        c = client.Client("yumyum", "")
+        c = client.Client("")
         c.startService()
         return c.stopService()
 

diff --git a/client.tac b/client.tac
index 7d987783579bbd5d11894a162c8ef0bbc298be57..a847dc98e720fa53d847f79eff57481634051cf9 100644 (file)
--- a/client.tac
+++ b/client.tac
@@ -3,9 +3,8 @@
 from allmydata import client
 from twisted.application import service
 
-queen_host = "yumyum"
 queen_pburl = "pb://jekyv6ghn7zinppk7wcvfmk7o4gw76hb@192.168.1.101:42552/roster"
-c = client.Client(queen_host, queen_pburl)
+c = client.Client(queen_pburl)
 
 application = service.Application("allmydata_client")
 c.setServiceParent(application)