|
@@ -285,9 +285,9 @@ class LocalNodeBuilder(NodeBuilder):
|
|
|
|
|
|
|
|
|
|
|
|
- print ("The tor binary at %r does not support the "
|
|
|
+ print (("The tor binary at %r does not support the "
|
|
|
"option in the torrc line:\n"
|
|
|
- "%r") % (tor, line.strip())
|
|
|
+ "%r") % (tor, line.strip()))
|
|
|
|
|
|
|
|
|
f.writelines(["# " + tor + " unsupported: " + line])
|
|
@@ -887,19 +887,16 @@ def usage(network):
|
|
|
|
|
|
|
|
|
def exit_on_error(err_msg):
|
|
|
- print "Error: {0}\n".format(err_msg)
|
|
|
- print usage(_THE_NETWORK)
|
|
|
+ print ("Error: {0}\n".format(err_msg))
|
|
|
+ print (usage(_THE_NETWORK))
|
|
|
sys.exit(1)
|
|
|
|
|
|
-def runConfigFile(verb, path):
|
|
|
+def runConfigFile(verb, data):
|
|
|
_GLOBALS = dict(_BASE_ENVIRON=_BASE_ENVIRON,
|
|
|
Node=Node,
|
|
|
ConfigureNodes=ConfigureNodes,
|
|
|
_THE_NETWORK=_THE_NETWORK)
|
|
|
|
|
|
- with open(path) as f:
|
|
|
- data = f.read()
|
|
|
-
|
|
|
exec(data, _GLOBALS)
|
|
|
network = _GLOBALS['_THE_NETWORK']
|
|
|
|