aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/chutney/Templating.py6
-rw-r--r--lib/chutney/TorNet.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/chutney/Templating.py b/lib/chutney/Templating.py
index 327a154..eb8586f 100644
--- a/lib/chutney/Templating.py
+++ b/lib/chutney/Templating.py
@@ -70,7 +70,7 @@ import os
_KeyError = KeyError
-class _DictWrapper:
+class _DictWrapper(object):
def __init__(self, parent=None):
self._parent = parent
@@ -162,7 +162,7 @@ class _BetterTemplate(string.Template):
def __init__(self, template):
string.Template.__init__(self, template)
-class _FindVarsHelper:
+class _FindVarsHelper(object):
def __init__(self, dflts):
self._dflts = dflts
self._vars = set()
@@ -173,7 +173,7 @@ class _FindVarsHelper:
except KeyError:
return ""
-class Template:
+class Template(object):
MAX_ITERATIONS = 32
def __init__(self, pattern, includePath=(".",)):
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 0c8db7c..f046e00 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -26,7 +26,7 @@ def mkdir_p(d):
return
raise
-class Node:
+class Node(object):
########
# Users are expected to call these:
def __init__(self, parent=None, **kwargs):
@@ -314,7 +314,7 @@ class TorEnviron(chutney.Templating.Environ):
return [ os.path.join(me['privnet_dir'], 'torrc_templates') ]
-class Network:
+class Network(object):
def __init__(self,defaultEnviron):
self._nodes = []
self._dfltEnv = defaultEnviron