Fixes jpype-project#782, jpype-project#779 and adds release number

Thrameos · Jul 10, 2020 · edf62e2 · edf62e2
1 parent e016284
commit edf62e2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/NOTICE b/NOTICE
@@ -4,7 +4,7 @@ Copyright (c) 2004-2008 Steve Menard
 Copyright (c) 2020 Lawrence Livermore National Security, LLC.
 Produced at the Lawrence Livermore National Laboratory
 
-LLNL-CODE-XXXXXXX
+LLNL-CODE- 812311
 
 All rights reserved.
 

diff --git a/README.rst b/README.rst
@@ -33,6 +33,7 @@ access to the entirety of CPython and Java libraries.
 :Version: |PypiVersion|_ |Conda|_
 
 The work on this project began on `Sourceforge <http://sourceforge.net/projects/jpype/>`__.
+LLNL-CODE- 812311
 
 
 .. |alerts| image:: https://img.shields.io/lgtm/alerts/g/jpype-project/jpype.svg?logo=lgtm&logoWidth=18
@@ -62,4 +63,4 @@ The work on this project began on `Sourceforge <http://sourceforge.net/projects/
 .. _Apache 2 License: https://github.com/jpype-project/jpype/blob/master/LICENSE
 .. _Python Docs: http://jpype.readthedocs.org/en/latest/
 
-
+SPDX-License-Identifier: Apache-2.0
diff --git a/jpype/_core.py b/jpype/_core.py
@@ -215,7 +215,7 @@ def startJVM(*args, **kwargs):
         source = str(ex)
         if "UnsupportedClassVersion" in source:
             import re
-            match = re.search("([0-9]+)\.[0-9]+", source)
+            match = re.search(r"([0-9]+)\.[0-9]+", source)
             if match:
                 version = int(match.group(1)) - 44
                 raise RuntimeError("%s is older than required Java version %d" % (

diff --git a/jpype/_jproxy.py b/jpype/_jproxy.py
@@ -66,9 +66,7 @@ def new(tp, *args, **kwargs):
         if actualIntf is None:
             actualIntf = _prepareInterfaces(cls, intf)
             tp.__jpype_interfaces__ = actualIntf
-        self = _jpype._JProxy.__new__(tp, None, actualIntf)
-        tp.__init__(self, *args, **kwargs)
-        return self
+        return _jpype._JProxy.__new__(tp, None, actualIntf)
 
     members = {'__new__': new}
     # Return the augmented class