Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Followup fixes for python 3 #177

Merged
merged 2 commits into from
Nov 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/test_assignable.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions tests/test_bad_declaration.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/test_basics.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions tests/test_bytearray.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions tests/test_cast.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/test_class_argument.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions tests/test_enum.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/test_implementation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions tests/test_interface.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/test_jnitable_overflow.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/test_method_multiple_signatures.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions tests/test_multidimension.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions tests/test_output_args.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 2 additions & 4 deletions tests/test_proxy.py
Original file line number Diff line number Diff line change
@@ -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 *

Expand Down
2 changes: 0 additions & 2 deletions tests/test_reflect.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 1 addition & 3 deletions tests/test_simple.py
Original file line number Diff line number Diff line change
@@ -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):

Expand Down