jep 4.2.1__tar.gz → 4.2.2__tar.gz

{jep-4.2.1/src/main/python/jep.egg-info → jep-4.2.2}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: jep
-Version: 4.2.1
+Version: 4.2.2
 Summary: Jep embeds CPython in Java
 Home-page: https://github.com/ninia/jep
 Author: Jep Developers
 Author-email: jep-project@googlegroups.com
 License: zlib/libpng
 Keywords: java
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: zlib/libpng License
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -67,8 +66,12 @@ Some benefits of embedding CPython in a JVM:
 
 Installation
 ------------
-Simply run ``pip install jep`` or download the source and run ``pip install .``.
-Building and installing require the JDK, Python, and optionally numpy to be installed beforehand.
+Simply run ``pip install --no-cache-dir --no-build-isolation jep`` or download
+the source and run ``pip install .``. Building and installing require the JDK,
+Python, setuptools, and optionally numpy to be installed beforehand. The 
+``--no-cache-dir`` and ``--no-build-isolation`` options are not strictly
+required, however those settings enable Jep to make customizations for your
+environment such as enabling numpy specific behavior if numpy is installed.
 
 Dependencies
 ------------
@@ -100,5 +103,3 @@ been resolved.
 
 
 *Jep Team*
-
-

{jep-4.2.1 → jep-4.2.2}/README.rst

@@ -39,8 +39,12 @@ Some benefits of embedding CPython in a JVM:
 
 Installation
 ------------
-Simply run ``pip install jep`` or download the source and run ``pip install .``.
-Building and installing require the JDK, Python, and optionally numpy to be installed beforehand.
+Simply run ``pip install --no-cache-dir --no-build-isolation jep`` or download
+the source and run ``pip install .``. Building and installing require the JDK,
+Python, setuptools, and optionally numpy to be installed beforehand. The 
+``--no-cache-dir`` and ``--no-build-isolation`` options are not strictly
+required, however those settings enable Jep to make customizations for your
+environment such as enabling numpy specific behavior if numpy is installed.
 
 Dependencies
 ------------

{jep-4.2.1 → jep-4.2.2}/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>black.ninia</groupId>
   <artifactId>jep</artifactId>
-  <version>4.2.1</version>
+  <version>4.2.2</version>
   <packaging>jar</packaging>
 
   <name>Java Embedded Python</name>
@@ -39,7 +39,7 @@
   <scm>
     <connection>scm:git:git://github.com/ninia/jep.git</connection>
     <developerConnection>scm:git:ssh://github.com:ninia/jep.git</developerConnection>
-    <url>https://github.com/ninia/jep/tree/v4.2.1</url>
+    <url>https://github.com/ninia/jep/tree/v4.2.2</url>
    </scm>
 
   <properties>

{jep-4.2.1 → jep-4.2.2}/src/main/c/Include/pyembed.h

@@ -44,7 +44,7 @@ typedef struct __JepThread JepThread;
 
 
 void pyembed_preinit(JNIEnv*, jint, jint, jint, jint, jint, jint, jint,
-                     jstring);
+                     jstring, jstring);
 void pyembed_startup(JNIEnv*, jobjectArray);
 void pyembed_shutdown(JavaVM*);
 void pyembed_shared_import(JNIEnv*, jstring);

{jep-4.2.1 → jep-4.2.2}/src/main/c/Jep/maininterpreter.c

@@ -47,11 +47,12 @@ JNIEXPORT void JNICALL Java_jep_MainInterpreter_setInitParams
  jint optimizeFlag,
  jint dontWriteBytecodeFlag,
  jint hashRandomizationFlag,
- jstring pythonHome)
+ jstring pythonHome,
+ jstring programName)
 {
     pyembed_preinit(env, noSiteFlag, noUserSiteDirectory, ignoreEnvironmentFlag,
                     verboseFlag, optimizeFlag, dontWriteBytecodeFlag,
-                    hashRandomizationFlag, pythonHome);
+                    hashRandomizationFlag, pythonHome, programName);
 }
 
 /*

{jep-4.2.1 → jep-4.2.2}/src/main/c/Jep/pyembed.c

@@ -239,7 +239,8 @@ void pyembed_preinit(JNIEnv *env,
                      jint optimizeFlag,
                      jint dontWriteBytecodeFlag,
                      jint hashRandomizationFlag,
-                     jstring pythonHome)
+                     jstring pythonHome,
+                     jstring programName)
 {
     if (noSiteFlag >= 0) {
         Py_NoSiteFlag = noSiteFlag;
@@ -270,6 +271,14 @@ void pyembed_preinit(JNIEnv *env,
         // Python documentation says that the string should not be changed for
         // the duration of the program so it can never be freed.
     }
+    if (programName) {
+        const char* nameAsUTF = (*env)->GetStringUTFChars(env, programName, NULL);
+        wchar_t* nameForPython = Py_DecodeLocale(nameAsUTF, NULL);
+        (*env)->ReleaseStringUTFChars(env, programName, nameAsUTF);
+        Py_SetProgramName(nameForPython);
+        // Python documentation says that the string should not be changed for
+        // the duration of the program so it can never be freed.
+    }
 }
 
 /*
@@ -561,7 +570,7 @@ void pyembed_shared_import(JNIEnv *env, jstring module)
 intptr_t pyembed_thread_init(JNIEnv *env, jobject cl, jobject caller,
                              jboolean hasSharedModules, jboolean usesubinterpreter,
                              jboolean isolated, jint useMainObmalloc, jint allowFork,
-			     jint allowExec, jint allowThreads, jint allowDaemonThreads,
+                             jint allowExec, jint allowThreads, jint allowDaemonThreads,
                              jint checkMultiInterpExtensions, jint ownGIL)
 {
     JepThread *jepThread;
@@ -587,8 +596,8 @@ intptr_t pyembed_thread_init(JNIEnv *env, jobject cl, jobject caller,
         PyEval_AcquireThread(mainThreadState);
 
 #if PY_MAJOR_VERSION > 3 || PY_MINOR_VERSION >= 12
-        PyInterpreterConfig config; 
-	if (isolated) {
+        PyInterpreterConfig config;
+        if (isolated) {
             config = (PyInterpreterConfig) _PyInterpreterConfig_INIT;
         } else {
             config = (PyInterpreterConfig) _PyInterpreterConfig_LEGACY_INIT;

{jep-4.2.1 → jep-4.2.2}/src/main/c/Objects/pyjtype.c

@@ -32,6 +32,13 @@ static PyTypeObject PyJType_Type;
 static PyTypeObject* pyjtype_get_cached(JNIEnv*, PyObject*, jclass);
 static int addMethods(JNIEnv*, PyObject*, jclass);
 
+/*
+* Flag to indicate if methods have been added to static types. Most types are
+* reinitialized for each interpreter but static types are shared between
+* interpreters and must be initialized only once.
+*/
+static int staticTypesInitialized = 0;
+
 /*
  * Populate pyjmethods for a type and add it to the cache. This is for custom
  * types with extra logic in c since we are not able to add pyjmethods before
@@ -127,12 +134,24 @@ static int populateCustomTypeDict(JNIEnv *env, PyObject* fqnToPyType)
                            &PyJObject_Type)) {
         return -1;
     }
-    /* TODO In python 3.8 buffer protocol was added to spec so pybuffer type can use a spec */
-    if (!addCustomTypeToTypeDict(env, fqnToPyType, JBUFFER_TYPE, &PyJBuffer_Type)) {
-        return -1;
-    }
-    if (!addCustomTypeToTypeDict(env, fqnToPyType, JOBJECT_TYPE, &PyJObject_Type)) {
-        return -1;
+    if (staticTypesInitialized) {
+        if (PyDict_SetItemString(fqnToPyType, PyJBuffer_Type.tp_name,
+                                 (PyObject * ) &PyJBuffer_Type)) {
+            return -1;
+        }
+        if (PyDict_SetItemString(fqnToPyType, PyJObject_Type.tp_name,
+                                 (PyObject * ) &PyJObject_Type)) {
+            return -1;
+        }
+    } else {
+        /* TODO In python 3.8 buffer protocol was added to spec so pybuffer type can use a spec */
+        if (!addCustomTypeToTypeDict(env, fqnToPyType, JBUFFER_TYPE, &PyJBuffer_Type)) {
+            return -1;
+        }
+        if (!addCustomTypeToTypeDict(env, fqnToPyType, JOBJECT_TYPE, &PyJObject_Type)) {
+            return -1;
+        }
+        staticTypesInitialized = 1;
     }
     return 0;
 }
@@ -297,10 +316,10 @@ static int addMethods(JNIEnv* env, PyObject* dict, jclass clazz)
             if (isAbstract) {
                 if (oneAbstractPyJMethod) {
                     /*
-		     * If there is already one abstract method and this method is also
-		     * abstract then this isn't a functional interface and there is no need
-		     * to keep track of abstract methods.
-		     */
+                    * If there is already one abstract method and this method is also
+                    * abstract then this isn't a functional interface and there is no need
+                    * to keep track of abstract methods.
+                    */
                     functionalInterface = JNI_FALSE;
                     oneAbstractPyJMethod = NULL;
                 } else {
@@ -440,7 +459,7 @@ static PyTypeObject* pyjtype_get_new(JNIEnv *env, PyObject *fqnToPyType,
          * See https://docs.python.org/3/library/functions.html#type
          */
         type = (PyTypeObject*) PyObject_CallFunctionObjArgs((PyObject*) &PyJType_Type,
-                shortName, bases, dict, NULL);
+               shortName, bases, dict, NULL);
     }
     Py_DECREF(bases);
     Py_DECREF(dict);

{jep-4.2.1 → jep-4.2.2}/src/main/java/jep/ClassList.java

@@ -127,8 +127,11 @@ public class ClassList implements ClassEnquirer {
                         String[] relativePaths = classpath.split(" ");
 
                         for (String relativePath : relativePaths) {
-                            String path = file.getParent() + File.separator
-                                    + relativePath;
+                            String path = relativePath;
+                            String parent = file.getParent();
+                            if (parent != null) {
+                                path = parent + File.separator + relativePath;
+                            }
                             if (!seen.contains(path)) {
                                 queue.add(path);
                                 seen.add(path);

{jep-4.2.1 → jep-4.2.2}/src/main/java/jep/MainInterpreter.java

@@ -138,7 +138,7 @@ public final class MainInterpreter implements AutoCloseable {
             setInitParams(pyConfig.noSiteFlag, pyConfig.noUserSiteDirectory,
                     pyConfig.ignoreEnvironmentFlag, pyConfig.verboseFlag,
                     pyConfig.optimizeFlag, pyConfig.dontWriteBytecodeFlag,
-                    pyConfig.hashRandomizationFlag, pyConfig.pythonHome);
+                    pyConfig.hashRandomizationFlag, pyConfig.pythonHome, pyConfig.programName);
         }
 
         thread = new Thread("JepMainInterpreter") {
@@ -293,7 +293,7 @@ public final class MainInterpreter implements AutoCloseable {
     private static native void setInitParams(int noSiteFlag,
             int noUserSiteDiretory, int ignoreEnvironmentFlag, int verboseFlag,
             int optimizeFlag, int dontWriteBytecodeFlag,
-            int hashRandomizationFlag, String pythonHome);
+            int hashRandomizationFlag, String pythonHome, String programName);
 
     private static native void initializePython(String[] mainInterpreterArgv);
 

{jep-4.2.1 → jep-4.2.2}/src/main/java/jep/PyConfig.java

@@ -36,9 +36,9 @@ package jep;
 public class PyConfig {
 
     /*
-     * -1 is used to indicate not set, in which case we will not set it in
-     * the native code and the setting will be Python's default. A value of 0
-     * or greater will cause the value to be set in the native code.
+     * -1 is used to indicate not set, in which case we will not set it in the
+     * native code and the setting will be Python's default. A value of 0 or
+     * greater will cause the value to be set in the native code.
      */
 
     protected int noSiteFlag = -1;
@@ -57,6 +57,8 @@ public class PyConfig {
 
     protected String pythonHome;
 
+    protected String programName;
+
     /**
      * Set the Py_NoSiteFlag variable on the python interpreter. This
      * corresponds to the python "-S" flag and will prevent the "site" module
@@ -155,7 +157,7 @@ public class PyConfig {
     }
 
     /**
-     * Set the home location on the python interpreter. THis is the location of
+     * Set the home location on the python interpreter. This is the location of
      * the standard python libraries. This corresponds to the environment
      * variable PYTHONHOME.
      * 
@@ -168,15 +170,27 @@ public class PyConfig {
         return this;
     }
 
+    /**
+     * Set the Py_SetProgramName variable on the python interpreter. This is
+     * used to initialize executable and in early error messages during python
+     * initialization.
+     * 
+     * @param programName
+     *            the name of the executable python program.
+     * @return a reference to this PyConfig
+     */
+    public PyConfig setProgramName(String programName) {
+        this.programName = programName;
+        return this;
+    }
+
     @Override
     public String toString() {
-        return "PyConfig [noSiteFlag=" + noSiteFlag + ", noUserSiteDirectory="
-                + noUserSiteDirectory + ", ignoreEnvironmentFlag="
-                + ignoreEnvironmentFlag + ", verboseFlag=" + verboseFlag
-                + ", optimizeFlag=" + optimizeFlag + ", dontWriteBytecodeFlag="
-                + dontWriteBytecodeFlag + ", hashRandomizationFlag="
-                + hashRandomizationFlag + ", pythonHome=" + pythonHome + "]";
+        return "PyConfig [noSiteFlag=" + noSiteFlag + ", noUserSiteDirectory=" + noUserSiteDirectory
+                + ", ignoreEnvironmentFlag=" + ignoreEnvironmentFlag + ", verboseFlag=" + verboseFlag
+                + ", optimizeFlag=" + optimizeFlag + ", dontWriteBytecodeFlag=" + dontWriteBytecodeFlag
+                + ", hashRandomizationFlag=" + hashRandomizationFlag + ", pythonHome=" + pythonHome + ", programName="
+                + programName + "]";
     }
 
-
 }

{jep-4.2.1 → jep-4.2.2}/src/main/python/jep/version.py

@@ -23,5 +23,5 @@
 #     distribution.
 #
 
-__VERSION__ = '4.2.1'
+__VERSION__ = '4.2.2'
 VERSION = __VERSION__

{jep-4.2.1 → jep-4.2.2/src/main/python/jep.egg-info}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: jep
-Version: 4.2.1
+Version: 4.2.2
 Summary: Jep embeds CPython in Java
 Home-page: https://github.com/ninia/jep
 Author: Jep Developers
 Author-email: jep-project@googlegroups.com
 License: zlib/libpng
 Keywords: java
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: zlib/libpng License
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -67,8 +66,12 @@ Some benefits of embedding CPython in a JVM:
 
 Installation
 ------------
-Simply run ``pip install jep`` or download the source and run ``pip install .``.
-Building and installing require the JDK, Python, and optionally numpy to be installed beforehand.
+Simply run ``pip install --no-cache-dir --no-build-isolation jep`` or download
+the source and run ``pip install .``. Building and installing require the JDK,
+Python, setuptools, and optionally numpy to be installed beforehand. The 
+``--no-cache-dir`` and ``--no-build-isolation`` options are not strictly
+required, however those settings enable Jep to make customizations for your
+environment such as enabling numpy specific behavior if numpy is installed.
 
 Dependencies
 ------------
@@ -100,5 +103,3 @@ been resolved.
 
 
 *Jep Team*
-
-

{jep-4.2.1 → jep-4.2.2}/src/main/python/jep.egg-info/SOURCES.txt

@@ -264,6 +264,7 @@ src/test/java/jep/test/types/TestFieldTypes.java
 src/test/java/jep/test/types/TestMethodTypes.java
 src/test/java/jep/test/types/TestStaticFieldTypes.java
 src/test/java/jep/test/types/TestStaticMethodTypes.java
+src/test/java/jep/test/util/SubInterpreterThread.java
 src/test/python/__init__.py
 src/test/python/jep_pipe.py
 src/test/python/runtests.py

jep-4.2.2/src/test/java/jep/test/util/SubInterpreterThread.java

@@ -0,0 +1,41 @@
+package jep.test.util;
+
+import jep.Interpreter;
+import jep.JepException;
+import jep.SubInterpreter;
+
+/**
+ * This is just a thread that runs some Python statements in a subinterpreter.
+ * It can be run from a Python unittest to verify SubInterpreter behavior
+ * without writing Java code.
+ */
+public class SubInterpreterThread extends Thread {
+
+    private final String[] pythonStatements;
+
+    private JepException exception;
+
+    public SubInterpreterThread(String... pythonStatements) {
+        this.pythonStatements = pythonStatements;
+    }
+
+    @Override
+    public void run() {
+        try (Interpreter interpreter = new SubInterpreter()) {
+            for (String statement : this.pythonStatements) {
+                interpreter.exec(statement);
+            }
+        } catch (JepException e) {
+            this.exception = e;
+        }
+    }
+
+    public boolean hasException() {
+        return exception != null;
+    }
+
+    public JepException getException() {
+        return exception;
+    }
+
+}

{jep-4.2.1 → jep-4.2.2}/src/test/python/test_regressions.py

@@ -35,3 +35,17 @@ class TestRegressions(unittest.TestCase):
         self.assertEqual('ParentClassWithMethod', ChildTestingMethodInheritance().checkPrecedence())
         ClassInheritingDefault = jep.findClass('jep.test.TestPyJType$ClassInheritingDefault')
         self.assertEqual('InterfaceWithDefault', ClassInheritingDefault().checkPrecedence())
+
+    def test_object_method_count(self):
+        # There was a bug where each new sub-interpreter would add all the
+        # Object methods onto multimethods on the Object type so the
+        # multimethod would grow with each new sub-interpreter.
+        from java.lang import Object
+        self.assertEqual(3, len(Object.wait.__methods__))
+        for i in range(3):
+            SubInterpreterThread = jep.findClass('jep.test.util.SubInterpreterThread')
+            thread = SubInterpreterThread();
+            thread.start();
+            thread.join();
+        from java.lang import Object
+        self.assertEqual(3, len(Object.wait.__methods__))