mirror of https://github.com/kivy/pyjnius.git
eliminate use of 'future' outside of tests, try to fix p2/p3 issues with setup.
This commit is contained in:
parent
a775a9b048
commit
209e57ed0d
|
@ -2,10 +2,8 @@ from __future__ import absolute_import
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from __future__ import division
|
from __future__ import division
|
||||||
from future import standard_library
|
|
||||||
standard_library.install_aliases()
|
|
||||||
from future.utils import with_metaclass
|
|
||||||
__all__ = ('autoclass', 'ensureclass')
|
__all__ = ('autoclass', 'ensureclass')
|
||||||
|
from six import with_metaclass
|
||||||
|
|
||||||
from .jnius import (
|
from .jnius import (
|
||||||
JavaClass, MetaJavaClass, JavaMethod, JavaStaticMethod,
|
JavaClass, MetaJavaClass, JavaMethod, JavaStaticMethod,
|
||||||
|
|
17
setup.py
17
setup.py
|
@ -4,11 +4,15 @@ from os import environ
|
||||||
from os.path import dirname, join, exists
|
from os.path import dirname, join, exists
|
||||||
import sys
|
import sys
|
||||||
from platform import architecture
|
from platform import architecture
|
||||||
|
import six
|
||||||
|
|
||||||
def getenv(key):
|
def getenv(key):
|
||||||
val = environ.get(key)
|
val = environ.get(key)
|
||||||
if val is not None:
|
if val is not None:
|
||||||
return val.decode('utf-8')
|
if six.PY3:
|
||||||
|
return val.decode()
|
||||||
|
else:
|
||||||
|
return val
|
||||||
else:
|
else:
|
||||||
return val
|
return val
|
||||||
|
|
||||||
|
@ -30,7 +34,7 @@ library_dirs = []
|
||||||
lib_location = None
|
lib_location = None
|
||||||
extra_link_args = []
|
extra_link_args = []
|
||||||
include_dirs = []
|
include_dirs = []
|
||||||
install_requires = []
|
install_requires = ['six']
|
||||||
|
|
||||||
# detect Python for android
|
# detect Python for android
|
||||||
platform = sys.platform
|
platform = sys.platform
|
||||||
|
@ -58,7 +62,10 @@ if platform == 'android':
|
||||||
elif platform == 'darwin':
|
elif platform == 'darwin':
|
||||||
import subprocess
|
import subprocess
|
||||||
framework = subprocess.Popen('/usr/libexec/java_home',
|
framework = subprocess.Popen('/usr/libexec/java_home',
|
||||||
shell=True, stdout=subprocess.PIPE).communicate()[0].decode().strip()
|
shell=True, stdout=subprocess.PIPE).communicate()[0]
|
||||||
|
if six.PY3:
|
||||||
|
framework = framework.decode();
|
||||||
|
framework = framework.strip()
|
||||||
print('java_home: {0}\n'.format(framework));
|
print('java_home: {0}\n'.format(framework));
|
||||||
if not framework:
|
if not framework:
|
||||||
raise Exception('You must install Java on your Mac OS X distro')
|
raise Exception('You must install Java on your Mac OS X distro')
|
||||||
|
@ -84,8 +91,8 @@ else:
|
||||||
else:
|
else:
|
||||||
jdk_home = subprocess.Popen('readlink -f `which javac` | sed "s:bin/javac::"',
|
jdk_home = subprocess.Popen('readlink -f `which javac` | sed "s:bin/javac::"',
|
||||||
shell=True, stdout=subprocess.PIPE).communicate()[0].strip()
|
shell=True, stdout=subprocess.PIPE).communicate()[0].strip()
|
||||||
if jdk_home is not None:
|
if jdk_home is not None and six.PY3:
|
||||||
jdk_home = jdk_home.decode('utf-8')
|
jdk_home = jdk_home.decode()
|
||||||
if not jdk_home or not exists(jdk_home):
|
if not jdk_home or not exists(jdk_home):
|
||||||
raise Exception('Unable to determine JDK_HOME')
|
raise Exception('Unable to determine JDK_HOME')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue