# HG changeset patch # User Jeff Hammel # Date 1487631770 28800 # Node ID d081ca2e869671d70b11a11003a7ce5255073391 # Parent 9e21b4fbd8b322a14e8c367d3c9a34978e50b575 py35 diff -r 9e21b4fbd8b3 -r d081ca2e8696 silvermirror/unify.py --- a/silvermirror/unify.py Tue May 12 18:33:30 2015 -0700 +++ b/silvermirror/unify.py Mon Feb 20 15:02:50 2017 -0800 @@ -13,8 +13,9 @@ from martini.config import ConfigMunger from pkg_resources import iter_entry_points from pprint import pprint -from utils import home -from utils import ip_addresses +from .utils import home +from .utils import ip_addresses + def make_config(filename): # XXX needed? @@ -22,6 +23,8 @@ def read_config(filename): + """read configuration `filename`""" + config = ConfigMunger(filename).dict() ### main configuration diff -r 9e21b4fbd8b3 -r d081ca2e8696 silvermirror/utils.py --- a/silvermirror/utils.py Tue May 12 18:33:30 2015 -0700 +++ b/silvermirror/utils.py Mon Feb 20 15:02:50 2017 -0800 @@ -2,11 +2,14 @@ import netifaces import os +import sys + def home(): # XXX needed? better way of doing? return os.environ['HOME'] + def ip_addresses(): """dictionary of ip4 addresses for the machine""" interfaces = [] @@ -22,6 +25,11 @@ for i in interfaces ]) -if __name__ == '__main__': + +def main(args=sys.argv[1:]): for name, value in sorted(ip_addresses().items()): - print '%s : %s' % (name, value) + print ('%s : %s' % (name, value)) + + +if __name__ == '__main__': + main()