diff --git a/python/examples/simple/example.py b/python/examples/simple/example.py index 132e7eb..7319eca 100755 --- a/python/examples/simple/example.py +++ b/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) diff --git a/python/examples/web/requirements.txt b/python/examples/web/requirements.txt index 21bc28a..19bf20f 100644 --- a/python/examples/web/requirements.txt +++ b/python/examples/web/requirements.txt @@ -1,2 +1,2 @@ six==1.10.0 -metaparticle_pkg<=0.5.0 +metaparticle_pkg diff --git a/python/examples/web/web.py b/python/examples/web/web.py index 8a3cee9..4b3a85f 100755 --- a/python/examples/web/web.py +++ b/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) diff --git a/python/metaparticle_pkg/__init__.py b/python/metaparticle_pkg/__init__.py index f8a2ade..d6e6f52 100644 --- a/python/metaparticle_pkg/__init__.py +++ b/python/metaparticle_pkg/__init__.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import from metaparticle_pkg.containerize import Containerize __all__ = [Containerize] diff --git a/python/metaparticle_pkg/builder/__init__.py b/python/metaparticle_pkg/builder/__init__.py index 73c614e..6b74e08 100644 --- a/python/metaparticle_pkg/builder/__init__.py +++ b/python/metaparticle_pkg/builder/__init__.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import from metaparticle_pkg.builder.docker_builder import DockerBuilder diff --git a/python/metaparticle_pkg/builder/docker_builder.py b/python/metaparticle_pkg/builder/docker_builder.py index ec7451b..b33b2d2 100644 --- a/python/metaparticle_pkg/builder/docker_builder.py +++ b/python/metaparticle_pkg/builder/docker_builder.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import json import logging diff --git a/python/metaparticle_pkg/builder/test/test_docker_builder.py b/python/metaparticle_pkg/builder/test/test_docker_builder.py index c628a36..9325f23 100644 --- a/python/metaparticle_pkg/builder/test/test_docker_builder.py +++ b/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 diff --git a/python/metaparticle_pkg/containerize.py b/python/metaparticle_pkg/containerize.py index 654b9d5..972869f 100644 --- a/python/metaparticle_pkg/containerize.py +++ b/python/metaparticle_pkg/containerize.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import os import shutil import signal diff --git a/python/metaparticle_pkg/option.py b/python/metaparticle_pkg/option.py index bd12e94..b0c459c 100644 --- a/python/metaparticle_pkg/option.py +++ b/python/metaparticle_pkg/option.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import from collections import namedtuple import sys import os diff --git a/python/metaparticle_pkg/runner/__init__.py b/python/metaparticle_pkg/runner/__init__.py index 8bb2fa8..31aaded 100644 --- a/python/metaparticle_pkg/runner/__init__.py +++ b/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 diff --git a/python/metaparticle_pkg/runner/docker_runner.py b/python/metaparticle_pkg/runner/docker_runner.py index 51e9c19..c3767dd 100644 --- a/python/metaparticle_pkg/runner/docker_runner.py +++ b/python/metaparticle_pkg/runner/docker_runner.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import logging from docker import APIClient diff --git a/python/metaparticle_pkg/runner/metaparticle.py b/python/metaparticle_pkg/runner/metaparticle.py index 50f58b9..1f2620d 100644 --- a/python/metaparticle_pkg/runner/metaparticle.py +++ b/python/metaparticle_pkg/runner/metaparticle.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import json import os import subprocess diff --git a/python/metaparticle_pkg/runner/test/test_docker_runner.py b/python/metaparticle_pkg/runner/test/test_docker_runner.py index cccc29e..68f5976 100644 --- a/python/metaparticle_pkg/runner/test/test_docker_runner.py +++ b/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 diff --git a/python/metaparticle_pkg/runner/test/test_metaparticle.py b/python/metaparticle_pkg/runner/test/test_metaparticle.py index 50d88b9..e78824f 100644 --- a/python/metaparticle_pkg/runner/test/test_metaparticle.py +++ b/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 diff --git a/python/metaparticle_pkg/test/test_containerize.py b/python/metaparticle_pkg/test/test_containerize.py index 90b41d7..3f72b00 100644 --- a/python/metaparticle_pkg/test/test_containerize.py +++ b/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 diff --git a/python/metaparticle_pkg/test/test_option.py b/python/metaparticle_pkg/test/test_option.py index a6464fd..5d78348 100644 --- a/python/metaparticle_pkg/test/test_option.py +++ b/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 diff --git a/python/setup.py b/python/setup.py index 5483aac..2370c15 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import setuptools import json diff --git a/tutorials/python/web.py b/tutorials/python/web.py index e2808c8..e80429b 100755 --- a/tutorials/python/web.py +++ b/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)