diff options
Diffstat (limited to 'lib/chutney/TorNet.py')
| -rw-r--r-- | lib/chutney/TorNet.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 82a5fc0..1c626ba 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -624,7 +624,17 @@ class Network(list): """A network of Tor nodes, plus functions to manipulate them """ def __init__(self, defaultEnviron=_BASE_ENVIRON): + """if name: + environ = chutney.Templating.Environ(parent=defaultEnviron) + + print("Using name %s" % name) + + environ["net_base_dir"] = os.path.join(environ["net_base_dir"], name) + + self._dfltEnv = environ + else:""" self._dfltEnv = defaultEnviron + self._nextnodenum = 0 def get(self, tag): @@ -754,8 +764,7 @@ def usage(network): " ".join(x for x in dir(network) if not x.startswith("_")))]) def runConfigFile(verb, f): - _GLOBALS = dict(_BASE_ENVIRON=_BASE_ENVIRON, - Node=Node, + _GLOBALS = dict(Node=Node, EventType=stem.control.EventType, time=time, thread=thread, |