Set PYTHONHOME from jpy.pythonPrefix setting

.gitignore

@@ -20,3 +20,4 @@ Vagrantfile
 *.so
 *.dll
 
+/bin/

CHANGES.md

@@ -2,10 +2,21 @@
 jpy Changelog
 *************
 
+Version 0.10 (in development)
+=============================
+
+* Make jpy work with Anaconda by setting environment variable 
+  `PYTHONHOME` from Java 
+  [#143](https://github.com/bcdev/jpy/issues/143). Contribution by Dr-Irv.  
+* Fixed: Constants are not properly passed from Java to Python when using interfaces 
+  [#140](https://github.com/bcdev/jpy/issues/140). Contribution by Dr-Irv.
+* Fixed: Cannot iterate through a dict in Python 3.x 
+  [#136](https://github.com/bcdev/jpy/issues/136). Contribution by Dr-Irv.
+
 Version 0.9
 ===========
 
-This version includes a number of contributions from supportive GitHub users. Thanks to all of you! 
+This version includes a number of contributions from supportive GitHub users. Thanks to all of you!
 
 Fixes
 -----
@@ -14,18 +25,31 @@ Fixes
 * Fixed problem where default methods on Java 8 Interfaces were not found (issue #102). Fix by Charles P. Wright.
 * Fixed error caused by missing `sys.argv` in Python when called from Java (issue #81). Fix by Dave Voutila.
 * Fixed problem where calling jpy.get_type() too many times causes a memory access error (issue #74). Fix by Dave Voutila.
-* Fixed a corruption when retrieving long values (#72). Fix by chipkent. 
+* Fixed a corruption when retrieving long values (#72). Fix by chipkent.
 * Fixed fatal error when stopping python session (issue #70, #77). Fix by Dave Voutila.
+# Explicit null checks for avoiding JVM crash (issue #126). Fix by Geomatys.
 
 Improvements
 ------------
 
 * Can now use pip to install Python `jpy` package directly from GitHub (#83).
-  This works for Linux and OS X where C compilers are available by default 
-  and should work on Windows with Visual Studio 15 installed. 
-  Contribution by Dave Voutila. 
-* Java `PyObject` is now serializable. Contribution by Mario Briggs. 
-
+  This works for Linux and OS X where C compilers are available by default
+  and should work on Windows with Visual Studio 15 installed.
+  Contribution by Dave Voutila.
+* Java `PyObject` is now serializable. Contribution by Mario Briggs.
+* Improved Varargs method matching.  You may pass in either an array (as in the
+  past) or individual Python arguments, the match for a varargs method call is
+  the minimum match for each of the arguments. Zero length arrays (i.e. no
+  arguments) are also permitted with a match value of 10.
+* `jpy.type_translations` dictionary for callbacks when instantiating Python objects.
+* `jpy.VerboseExceptions` enables full Java stack traces.
+* More Python exceptions are translated to the corresponding Java type.
+* Globals and locals are converted when executing code with PyLib, to allow variables to be
+  used across statement invocation; and interrogated from Java.
+* PyObject wrappers for dictionary, list, and introspection functions to tell
+  you whether or not you can convert the object.
+* Support for isAssignable checks when dealing with Python Strings and primitives, to allow
+  matches for argument types such as `java.lang.Comparable` or `java.lang.Number`.
 
 Version 0.8
 ===========

README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/bcdev/jpy.svg?branch=master)](https://travis-ci.org/bcdev/jpy)
-[![Build Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true)](https://ci.appveyor.com/project/forman/jpy)
+[![Build Status](https://ci.appveyor.com/api/projects/status/ywkcey4nlt0avasf?svg=true)](https://ci.appveyor.com/project/bcdev/jpy)
 [![Documentation Status](https://readthedocs.org/projects/jpy/badge/?version=latest)](http://jpy.readthedocs.org/en/latest/?badge=latest)
 
 

appveyor.yml

@@ -66,3 +66,18 @@ install:
 build_script:
   - set PATH=%JPY_PYTHON_HOME%;%JPY_PYTHON_HOME%\DLLs;%JPY_JDK_HOME%;%JPY_JDK_HOME%\bin;%PATH%
   - call "%JPY_PYTHON_HOME%\python.exe" setup.py --maven bdist_wheel
+  - move dist win
+
+artifacts:
+  - path: 'win\*.whl'
+    name: wheel
+
+deploy:
+  - provider: FTP
+    protocol: ftp
+    host: ftp.brockmann-consult.de
+    username: jpy
+    password:
+      secure: AMte8IErI/LRGmLGq4Y5YQ==
+    folder: software
+    debug: true    

doc/install.rst

@@ -84,12 +84,23 @@ Another optional parameter
 
 * ``jpy.debug`` - which is either ``true`` or ``false`` can be used to output extra debugging information.
 
+The optional parameter
+
+* ``jpy.pythonPrefix`` - points to the location of the PYTHONHOME.  If set, then jpy will call ``PyLib.setPythonHome()`` with the value of this parameter.
+
 All the parameters can be passed directly to the JVM either as Java system properties or by using the single system property
 
 * ``jpy.config`` - which is a path to a Java properties files containing the definitions of the two parameters named above.
 
 Such property file is also written for each build and is found in ``build/lib-<os-platform>-<python-version>/jpyconfig.properties``.
 
+Setting PYTHONHOME
+------------------
+
+If the environment variable ``PYTHONHOME`` is not set when you call Python from Java, you may get an error about
+file system encodings not being found. It is possible to set the location of Python from your
+Java program.  Use ``PyLib.setPythonHome(pathToPythonHome)`` to do that, where ``pathToPythonHome`` is a ``String`` that 
+contains the location of the Python installation, or as described above, use the parameter ``jpy.pytyhonPrefix``.
 
 ========================
 Build for Linux / Darwin

doc/intro.rst

@@ -90,11 +90,8 @@ then we can call the Python code from Java as follows ::
     // Import the Python module
     PyModule plugInModule = PyLib.importModule("bibo_plugin");
 
-    // Get the Python class
-    PyObject plugInClass = plugInModule.getAttribute("BiboPlugIn");
-
     // Call the Python class to instantiate an object
-    PyObject plugInObj = plugInClass.call();
+    PyObject plugInObj = plugInModule.call("BiboPlugin");
 
     // Create a Java proxy object for the Python object
     PlugIn plugIn = plugInObj.createProxy(PlugIn.class);

doc/reference.rst

@@ -218,6 +218,20 @@ Variables
     Here a call to the ``read`` method will modify the numpy array's content as desired and return the
     same array instance as indicated by the Java method's specification.
 
+.. py:data:: type_translations
+    :module: jpy
+
+    Contains callbacks which are called when instantiating a Python object from a Java object.
+    After the standard wrapping of the Java object as a Python object, the Java type name is looked up in this
+    dictionary.  If the returned item is a callable, the callable is called with the JPy object as an argument,
+    and the callable's result is returned to the user.
+
+
+.. py:data:: VerboseExceptions.enabled
+    :module: jpy
+
+    If set to true, then jpy will produce more verbose exception messages; which include the full Java stack trace.
+    If set to false, then jpy produces exceptions using only the underlying Java exception's toString method.
 
 .. py:data:: diag
     :module: jpy
@@ -379,7 +393,7 @@ Java object types
 | ``java.lang.String``    |      1       |     0    |     0   |      0     |   100   |
 +-------------------------+--------------+----------+---------+------------+---------+
 | ``java.lang.Object``    |      1       |    10    |    10   |     10     |    10   |
-+-------------------------+--------------+----------+---------+------------+---------+
++-------------------------+--------------+----------+---------+------------+---------+jpy
 
 Java primitive array types
 --------------------------
@@ -410,6 +424,9 @@ given above, the a match value of 10 applies, as long as the item size of a buff
 Java object array types
 -----------------------
 
+For String arrays, if a sequence is matched with a value of 80 if all the elements in the sequence are Python strings.
+
+
 todo
 
 

jpyutil.py

@@ -32,8 +32,8 @@
 import subprocess
 
 
-__author__ = "Norman Fomferra, Brockmann Consult GmbH"
-__copyright__ = "Copyright 2015-2017 Brockmann Consult GmbH"
+__author__ = "Norman Fomferra (Brockmann Consult GmbH) and contributors"
+__copyright__ = "Copyright 2015-2018 Brockmann Consult GmbH and contributors"
 __license__ = "Apache 2.0"
 __version__ = "0.9.1.dev1"
 

pom.xml

@@ -188,4 +188,4 @@
         </snapshotRepository>
     </distributionManagement>
 
-</project>
+</project>

setup.py

@@ -56,6 +56,7 @@
 sources = [
     os.path.join(src_main_c_dir, 'jpy_module.c'),
     os.path.join(src_main_c_dir, 'jpy_diag.c'),
+    os.path.join(src_main_c_dir, 'jpy_verboseexcept.c'),
     os.path.join(src_main_c_dir, 'jpy_conv.c'),
     os.path.join(src_main_c_dir, 'jpy_compat.c'),
     os.path.join(src_main_c_dir, 'jpy_jtype.c'),
@@ -98,6 +99,7 @@
     os.path.join(src_test_py_dir, 'jpy_typeconv_test.py'),
     os.path.join(src_test_py_dir, 'jpy_typeres_test.py'),
     os.path.join(src_test_py_dir, 'jpy_modretparam_test.py'),
+    os.path.join(src_test_py_dir, 'jpy_translation_test.py'),
     os.path.join(src_test_py_dir, 'jpy_gettype_test.py'),
 ]
 
@@ -200,7 +202,7 @@ def test_python_java_classes():
     """ Run Python tests against JPY test classes """
     sub_env = {'PYTHONPATH': _build_dir()}
 
-    log.info('Executing Python unit tests (against Java runtime classes)...')
+    log.info('Executing Python unit tests (against JPY test classes)...')
     return jpyutil._execute_python_scripts(python_java_jpy_tests,
                                             env=sub_env)