ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 13:33:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

client.py: add missing import, fix wrong name

Browse Source 
Without these, clients with a non-empty connections.yaml would crash as
they start up. It's safe to say we need some tests for this :-).

pyflakes catches all of these, but it got accidentally disabled
recently, so travis wasn't running it. I'll fix that in the next commit.
This commit is contained in:
Brian Warner 2016-07-19 17:23:02 -07:00
parent 02362ae52c
commit 9c1e22209f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/allmydata/client.py
View File

@ -8,6 +8,7 @@ from twisted.application import service
from twisted.application.internet import TimerService from twisted.application.internet import TimerService
from twisted.python.filepath import FilePath from twisted.python.filepath import FilePath
from pycryptopp.publickey import rsa from pycryptopp.publickey import rsa
from foolscap.api import eventually
import allmydata import allmydata
from allmydata.storage.server import StorageServer from allmydata.storage.server import StorageServer
@ -188,7 +189,6 @@ class Client(node.Node, pollmixin.PollMixin):
Load the connections.yaml file if it exists, otherwise Load the connections.yaml file if it exists, otherwise
create a default configuration. create a default configuration.
""" """
self.warn_flag = False
connections_filepath = FilePath(os.path.join(self.basedir, "private", "connections.yaml")) connections_filepath = FilePath(os.path.join(self.basedir, "private", "connections.yaml"))
def construct_unicode(loader, node): def construct_unicode(loader, node):
return node.value return node.value
@ -198,7 +198,6 @@ class Client(node.Node, pollmixin.PollMixin):
with connections_filepath.open() as f: with connections_filepath.open() as f:
self.connections_config = yaml.safe_load(f) self.connections_config = yaml.safe_load(f)
except EnvironmentError: except EnvironmentError:
exists = False
self.connections_config = { 'servers' : {} } self.connections_config = { 'servers' : {} }
connections_filepath.setContent(yaml.safe_dump(self.connections_config)) connections_filepath.setContent(yaml.safe_dump(self.connections_config))
@ -383,7 +382,7 @@ class Client(node.Node, pollmixin.PollMixin):
# utilize the loaded static server specifications # utilize the loaded static server specifications
servers = self.connections_config['servers'] servers = self.connections_config['servers']
for server_key in servers.keys(): for server_key in servers.keys():
eventually(self.storage_broker.got_static_announcement, server_key, servers[server_id]['announcement']) eventually(self.storage_broker.got_static_announcement, server_key, servers[server_key]['announcement'])
sb.use_introducer(self.introducer_client) sb.use_introducer(self.introducer_client)