Python 3.x compatibilities

dnaeon · Jan 26, 2015 · 5624c14 · 5624c14
1 parent 0a70eae
commit 5624c14
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/vpoller-client b/src/vpoller-client
@@ -32,6 +32,8 @@ discovering and polling of vSphere Object properties.
 
 """
 
+from __future__ import print_function
+
 import logging
 
 from vpoller import __version__
@@ -103,7 +105,7 @@ Examples:
 
     data = client.run(msg)
 
-    print data
+    print('{}'.format(data))
 
 if __name__ == '__main__':
     main()
diff --git a/src/vpoller-proxy b/src/vpoller-proxy
@@ -30,6 +30,8 @@ between a pool of ZeroMQ workers.
 
 """
 
+from __future__ import print_function
+
 import os
 import logging
 
@@ -60,7 +62,7 @@ def stop(endpoint):
     client = VPollerClient(endpoint=endpoint, timeout=1000, retries=3)
     result = client.run({'method': 'shutdown'})
 
-    print result
+    print('{}'.format(result))
 
 def status(endpoint):
     """
@@ -73,7 +75,7 @@ def status(endpoint):
     client = VPollerClient(endpoint=endpoint, timeout=1000, retries=3)
     result = client.run({'method': 'status'})
 
-    print result
+    print('{}'.format(result))
 
 def main():
 
@@ -102,7 +104,7 @@ Options:
     args = docopt(usage, version=__version__)
 
     if not os.path.exists(args['--file']):
-        raise SystemExit, 'Configuration file %s does not exist'
+        raise SystemExit('Configuration file {} does not exist'.format(args['--file']))
 
     level = logging.DEBUG if args['--debug'] else logging.INFO
     logging.basicConfig(

diff --git a/src/vpoller-worker b/src/vpoller-worker
@@ -33,6 +33,8 @@ performing the actual polling from a vCenter server.
 
 """
 
+from __future__ import print_function
+
 import os
 import logging
 
@@ -70,7 +72,7 @@ def stop(endpoint):
     client = VPollerClient(endpoint=endpoint, timeout=1000, retries=3)
     result = client.run({'method': 'shutdown'})
 
-    print result
+    print('{}'.format(result))
 
 def status(endpoint):
     """
@@ -83,7 +85,7 @@ def status(endpoint):
     client = VPollerClient(endpoint=endpoint, timeout=1000, retries=3)
     result = client.run({'method': 'status'})
 
-    print result
+    print('{}'.format(result))
 
 def main():
     usage="""
@@ -114,7 +116,7 @@ Options:
     args = docopt(usage, version=__version__)
 
     if not os.path.exists(args['--file']):
-        raise SystemExit, 'Configuration file %s does not exist' % args['--file']
+        raise SystemExit('Configuration file {} does not exist'.format(args['--file']))
 
     level = logging.DEBUG if args['--debug'] else logging.INFO
     logging.basicConfig(