diff --git a/.travis.yml b/.travis.yml index b4c798c8..bcfec1e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - sudo apt-get install python-pip openjdk-7-jdk install: - - pip install --upgrade cython future six + - pip install --upgrade cython six script: - make diff --git a/tests/test_assignable.py b/tests/test_assignable.py index 2922db84..9a2783a2 100644 --- a/tests/test_assignable.py +++ b/tests/test_assignable.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius import autoclass, JavaException diff --git a/tests/test_bad_declaration.py b/tests/test_bad_declaration.py index 90ffef64..93b6b331 100644 --- a/tests/test_bad_declaration.py +++ b/tests/test_bad_declaration.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius import JavaException, JavaClass from jnius.reflect import autoclass diff --git a/tests/test_basics.py b/tests/test_basics.py index 18ccc797..d6ebd5c1 100644 --- a/tests/test_basics.py +++ b/tests/test_basics.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius.reflect import autoclass diff --git a/tests/test_bytearray.py b/tests/test_bytearray.py index 9fbca694..50fcd0b0 100644 --- a/tests/test_bytearray.py +++ b/tests/test_bytearray.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius import autoclass diff --git a/tests/test_cast.py b/tests/test_cast.py index 6dcf12f3..6562cd95 100644 --- a/tests/test_cast.py +++ b/tests/test_cast.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius.reflect import autoclass from jnius import cast diff --git a/tests/test_class_argument.py b/tests/test_class_argument.py index 0264383c..31f4b40f 100644 --- a/tests/test_class_argument.py +++ b/tests/test_class_argument.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius.reflect import autoclass diff --git a/tests/test_enum.py b/tests/test_enum.py index 1e6edeef..d590639c 100644 --- a/tests/test_enum.py +++ b/tests/test_enum.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius.reflect import autoclass diff --git a/tests/test_implementation.py b/tests/test_implementation.py index c6f3d319..81b66bef 100644 --- a/tests/test_implementation.py +++ b/tests/test_implementation.py @@ -2,8 +2,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius.reflect import autoclass diff --git a/tests/test_interface.py b/tests/test_interface.py index 42b27684..1d8282a3 100644 --- a/tests/test_interface.py +++ b/tests/test_interface.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius import autoclass, JavaException diff --git a/tests/test_jnitable_overflow.py b/tests/test_jnitable_overflow.py index cef4b85a..0a98bc77 100644 --- a/tests/test_jnitable_overflow.py +++ b/tests/test_jnitable_overflow.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() # run it, and check with Java VisualVM if we are eating too much memory or not! if __name__ == '__main__': from jnius import autoclass diff --git a/tests/test_method_multiple_signatures.py b/tests/test_method_multiple_signatures.py index 3f892fd8..3e4266fb 100644 --- a/tests/test_method_multiple_signatures.py +++ b/tests/test_method_multiple_signatures.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius.reflect import autoclass diff --git a/tests/test_multidimension.py b/tests/test_multidimension.py index 6ab0fd7c..0c4b7dea 100644 --- a/tests/test_multidimension.py +++ b/tests/test_multidimension.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius.reflect import autoclass diff --git a/tests/test_output_args.py b/tests/test_output_args.py index e6a0fff5..25473570 100644 --- a/tests/test_output_args.py +++ b/tests/test_output_args.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius import autoclass diff --git a/tests/test_proxy.py b/tests/test_proxy.py index e8b43379..1ed01b91 100644 --- a/tests/test_proxy.py +++ b/tests/test_proxy.py @@ -1,10 +1,8 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from builtins import super -from future import standard_library -standard_library.install_aliases() -from builtins import range +from six.moves import range + from jnius import autoclass, java_method, PythonJavaClass, cast from nose.tools import * diff --git a/tests/test_reflect.py b/tests/test_reflect.py index 6a166a66..fc6e8c9a 100644 --- a/tests/test_reflect.py +++ b/tests/test_reflect.py @@ -1,8 +1,6 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius.reflect import autoclass diff --git a/tests/test_simple.py b/tests/test_simple.py index 68559017..edfcd996 100644 --- a/tests/test_simple.py +++ b/tests/test_simple.py @@ -1,11 +1,9 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -from future import standard_library -standard_library.install_aliases() import unittest from jnius import JavaClass, MetaJavaClass, JavaMethod -from future.utils import with_metaclass +from six import with_metaclass class HelloWorldTest(unittest.TestCase):