summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Utils.py')
-rw-r--r--src/lib/Bcfg2/Utils.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Utils.py b/src/lib/Bcfg2/Utils.py
index 4d2ddebd8..faabf9346 100644
--- a/src/lib/Bcfg2/Utils.py
+++ b/src/lib/Bcfg2/Utils.py
@@ -166,7 +166,7 @@ class ExecutorResult(object):
raise TypeError("'%s' object does not support item assignment" %
self.__class__.__name__)
- def __nonzero__(self):
+ def __bool__(self):
return self.__bool__()
def __bool__(self):
@@ -308,7 +308,7 @@ def hostnames2ranges(hostnames):
hosts[key] = [match.group(2)]
ranges = []
- for name, nums in hosts.items():
+ for name, nums in list(hosts.items()):
ranges.append(name[0] + list2range(nums) + name[1])
return ranges
@@ -318,7 +318,7 @@ def safe_input(msg):
# flush input buffer
while len(select.select([sys.stdin.fileno()], [], [], 0.0)[0]) > 0:
os.read(sys.stdin.fileno(), 4096)
- return input(msg)
+ return eval(input(msg))
def safe_module_name(prefix, module):