From: David Stainton Date: Wed, 15 Jul 2015 19:35:10 +0000 (-0700) Subject: minor corrections X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/readonly?a=commitdiff_plain;h=4e8d8e076aef99d041a77e2ea7efec73a9cc2786;p=tahoe-lafs%2Ftahoe-lafs.git minor corrections --- diff --git a/src/allmydata/scripts/magic_folder_cli.py b/src/allmydata/scripts/magic_folder_cli.py index 08c47767..498de58a 100644 --- a/src/allmydata/scripts/magic_folder_cli.py +++ b/src/allmydata/scripts/magic_folder_cli.py @@ -23,7 +23,7 @@ class CreateOptions(BasedirOptions): if self.nickname and not self.localdir: raise usage.UsageError("If NICKNAME is specified then LOCALDIR must also be specified.") node_url_file = os.path.join(self['node-directory'], "node.url") - self['node-url'] = open(node_url_file, "r").read().strip() + self['node-url'] = fileutil.read(node_url_file).strip() def create(options): from allmydata.scripts import tahoe_add_alias @@ -38,7 +38,7 @@ def create(options): invite_options.nickname = options.nickname invite_options.stdin = StringIO("") invite_options.stdout = StringIO() - invite_options.strerr = StringIO() + invite_options.stderr = StringIO() rc = invite(invite_options) if rc != 0: print >>options.stderr, "magic-folder: failed to invite after create\n"