Drive-by cleanups

python/examples/simple/example.py

@@ -1,8 +1,11 @@
 #!/usr/bin/python
+from __future__ import absolute_import
+from __future__ import print_function
 from metaparticle_pkg import Containerize
 
 import time
 import logging
+from six.moves import range
 
 # all metaparticle output is accessible through the stdlib logger (debug level)
 logging.basicConfig(level=logging.INFO)
@@ -21,7 +24,7 @@ def main():
     print('hello world!')
 
     for i in range(5):
-        print('Sleeping ... {} sec'.format(i))
+        print(('Sleeping ... {} sec'.format(i)))
         time.sleep(1)
 
 

python/examples/web/requirements.txt

@@ -1,2 +1,2 @@
 six==1.10.0
-metaparticle_pkg<=0.5.0
+metaparticle_pkg

python/examples/web/web.py

@@ -1,4 +1,6 @@
 #!/usr/bin/python
+from __future__ import absolute_import
+from __future__ import print_function
 from metaparticle_pkg import Containerize
 
 import logging
@@ -21,7 +23,7 @@ def do_GET(self):
         self.send_header("Content-type", "text/plain")
         self.end_headers()
         self.wfile.write("Hello Metaparticle [{}] @ {}\n".format(self.path, socket.gethostname()).encode('UTF-8'))
-        print("request for {}".format(self.path))
+        print(("request for {}".format(self.path)))
 
     def do_HEAD(self):
         self.send_response(OK)

python/metaparticle_pkg/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from metaparticle_pkg.containerize import Containerize
 
 __all__ = [Containerize]

python/metaparticle_pkg/builder/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from metaparticle_pkg.builder.docker_builder import DockerBuilder
 
 

python/metaparticle_pkg/builder/docker_builder.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import json
 import logging
 

python/metaparticle_pkg/builder/test/test_docker_builder.py

@@ -2,6 +2,7 @@
 '''Unit tests for DockerBuilder'''
 
 
+from __future__ import absolute_import
 import unittest
 from unittest.mock import patch
 from metaparticle_pkg.builder import docker_builder

python/metaparticle_pkg/containerize.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 import shutil
 import signal

python/metaparticle_pkg/option.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from collections import namedtuple
 import sys
 import os

python/metaparticle_pkg/runner/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from metaparticle_pkg.runner.docker_runner import DockerRunner
 from metaparticle_pkg.runner.metaparticle import MetaparticleRunner
 

python/metaparticle_pkg/runner/docker_runner.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import logging
 
 from docker import APIClient

python/metaparticle_pkg/runner/metaparticle.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import json
 import os
 import subprocess

python/metaparticle_pkg/runner/test/test_docker_runner.py

@@ -2,6 +2,7 @@
 '''Unit tests for DockerRunner'''
 
 
+from __future__ import absolute_import
 import unittest
 from unittest.mock import patch, MagicMock
 from metaparticle_pkg.runner import docker_runner

python/metaparticle_pkg/runner/test/test_metaparticle.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 '''Unit tests for MetaparticleRunner'''
 
+from __future__ import absolute_import
 import unittest
 from unittest.mock import patch, MagicMock, mock_open
 from metaparticle_pkg.runner import metaparticle

python/metaparticle_pkg/test/test_containerize.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 '''Unit tests for containerize module'''
 
+from __future__ import absolute_import
 import unittest
 from unittest.mock import patch, mock_open, MagicMock
 from metaparticle_pkg import containerize

python/metaparticle_pkg/test/test_option.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 '''Unit tests for option module'''
 
+from __future__ import absolute_import
 from sys import exit as real_exit
 import unittest
 from unittest.mock import patch, MagicMock

python/setup.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import setuptools
 import json
 

tutorials/python/web.py

@@ -1,5 +1,7 @@
 #!/usr/bin/python
 
+from __future__ import absolute_import
+from __future__ import print_function
 from six.moves import SimpleHTTPServer, socketserver
 import socket
 
@@ -14,7 +16,7 @@ def do_GET(self):
         self.send_header("Content-type", "text/plain")
         self.end_headers()
         self.wfile.write("Hello Metparticle [{}] @ {}\n".format(self.path, socket.gethostname()).encode('UTF-8'))
-        print("request for {}".format(self.path))
+        print(("request for {}".format(self.path)))
 
     def do_HEAD(self):
         self.send_response(OK)