Merge branch 'master' into python-implementing-interface-fixes

kivy · Apr 30, 2018 · 1845a3d · 1845a3d
2 parents d9f6f0a + d5468fb
commit 1845a3d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -28,5 +28,5 @@ html:
 
 # for use in travis; tests whatever you got.
 # use PYTHON3=1 to force python3 in other environments.
-tests: 
+tests:
 	(cd tests; env CLASSPATH=../build/test-classes:../build/classes PYTHONPATH=..:$(PYTHONPATH) $(NOSETESTS) -v)
diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ need. The previous example can be done manually as follows:
 
 ```python
 from time import sleep
-from java import MetaJavaClass, JavaClass, JavaMethod, JavaStaticMethod
+from jnius import MetaJavaClass, JavaClass, JavaMethod, JavaStaticMethod
 
 class Hardware(JavaClass):
     __metaclass__ = MetaJavaClass

diff --git a/jnius/jnius.pyx b/jnius/jnius.pyx
@@ -86,6 +86,7 @@ Python::
 '''
 
 __all__ = ('JavaObject', 'JavaClass', 'JavaMethod', 'JavaField',
+           'JavaStaticMethod', 'JavaStaticField', 'JavaMultipleMethod',
            'MetaJavaBase', 'MetaJavaClass', 'JavaException', 'cast',
            'find_javaclass', 'PythonJavaClass', 'java_method', 'detach')
 
@@ -99,7 +100,7 @@ include "config.pxi"
 
 IF JNIUS_PLATFORM == "android":
     include "jnius_jvm_android.pxi"
-ELIF JNIUS_PLATFORM == "win32":    
+ELIF JNIUS_PLATFORM == "win32":
     include "jnius_jvm_desktop.pxi"
 ELSE:
     include "jnius_jvm_dlopen.pxi"
@@ -110,7 +111,7 @@ include "jnius_conversion.pxi"
 include "jnius_localref.pxi"
 IF JNIUS_PYTHON3:
     include "jnius_nativetypes3.pxi"
-ELSE:    
+ELSE:
     include "jnius_nativetypes.pxi"
 
 include "jnius_export_func.pxi"