Skip to content

Commit

Permalink
Remove references to java 7 and python 2.
Browse files Browse the repository at this point in the history
  • Loading branch information
bsteffensmeier committed Feb 6, 2021
1 parent 93b2b17 commit 5e418a6
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 3,734 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ matrix:
- os: linux
language: java
jdk: openjdk14
- os: linux
language: java
jdk: openjdk15
- os: osx
language: generic

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ def read_file(name):

# my hacks to compile java files
java_files=get_files('.java'),
extra_jar_files=['src/main/resources/jep/classlist_7.txt',
'src/main/resources/jep/classlist_8.txt',
extra_jar_files=['src/main/resources/jep/classlist_8.txt',
'src/main/resources/jep/classlist_9.txt',
'src/main/resources/jep/classlist_10.txt',
'src/main/resources/jep/classlist_11.txt'],
Expand Down
4 changes: 3 additions & 1 deletion src/main/c/Jep/pyembed.c
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,9 @@ static PyObject* pyembed_jproxy(PyObject *self, PyObject *args)
// make sure target doesn't get garbage collected
Py_INCREF(pytarget);

result = jobject_As_PyObject(env, proxy);
jclass clazz = (*env)->GetObjectClass(env, proxy);
result = jobject_As_PyJObject(env, proxy, clazz);
(*env)->DeleteLocalRef(env, clazz);
(*env)->DeleteLocalRef(env, proxy);
return result;
}
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/jep/ClassList.java
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,7 @@ private void loadClassList() throws JepException {
Thread.currentThread().getContextClassLoader(),
Jep.class.getClassLoader() };
String rsc = "jep/classlist_";
if (version.startsWith("1.7")) {
rsc += "7";
} else if (version.startsWith("1.8")) {
if (version.startsWith("1.8")) {
rsc += "8";
} else if (version.startsWith("9.")) {
rsc += "9";
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/jep/python/PyCallable.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@
* </pre>
*
* @see <a href=
* "https://docs.python.org/2/reference/expressions.html#calls">Python 2
* Call Expression</a>
* @see <a href=
* "https://docs.python.org/3/reference/expressions.html#calls">Python 3
* Call Expression</a>
* @author Nate Jensen
Expand Down
Loading

0 comments on commit 5e418a6

Please sign in to comment.