[Jython-checkins] jython: Avoid deprecation warnings (and other tidying up)

[jeff.allen]

https://hg.python.org/jython/rev/6c6c57ca6320
changeset:   8333:6c6c57ca6320
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Sun Feb 23 20:56:43 2020 +0000
summary:
  Avoid deprecation warnings (and other tidying up)

files:
  src/org/python/core/packagecache/CachedJarsPackageManager.java |  24 ++++-----
  src/org/python/expose/generate/ExposeTask.java                 |  11 +----
  src/org/python/modules/posix/PythonPOSIXHandler.java           |  16 ++++++-
  3 files changed, 26 insertions(+), 25 deletions(-)


diff --git a/src/org/python/core/packagecache/CachedJarsPackageManager.java b/src/org/python/core/packagecache/CachedJarsPackageManager.java
--- a/src/org/python/core/packagecache/CachedJarsPackageManager.java
+++ b/src/org/python/core/packagecache/CachedJarsPackageManager.java
@@ -841,24 +841,20 @@
      * before {@link #initCache}. cachedir is the cache repository directory, this is eventually
      * created. Returns true if dir works.
      */
-    protected boolean useCacheDir(File aCachedir1) {
-
-        if (aCachedir1 == null) {
-            return false;
-        }
-
+    protected boolean useCacheDir(File cachedir) {
         try {
-            if (!aCachedir1.isDirectory() && aCachedir1.mkdirs() == false) {
-                warning("failed to create cache dir ''{0}''", aCachedir1);
-                return false;
+            if (cachedir != null) {
+                if (cachedir.isDirectory() || cachedir.mkdirs()) {
+                    this.cachedir = cachedir;
+                    return true;
+                } else {
+                    warning("failed to create cache dir ''{0}''", cachedir);
+                }
             }
         } catch (AccessControlException ace) {
-            warning("Not permitted to access cache ''{0}'' ({1})", aCachedir1, ace.getMessage());
-            return false;
+            warning("Not permitted to access cache ''{0}'' ({1})", cachedir, ace.getMessage());
         }
-
-        this.cachedir = aCachedir1;
-        return true;
+        return false;
     }
 
 }
diff --git a/src/org/python/expose/generate/ExposeTask.java b/src/org/python/expose/generate/ExposeTask.java
--- a/src/org/python/expose/generate/ExposeTask.java
+++ b/src/org/python/expose/generate/ExposeTask.java
@@ -8,8 +8,6 @@
 
 import org.apache.tools.ant.BuildException;
 import org.objectweb.asm.ClassWriter;
-import org.python.core.Py;
-import org.python.core.Options;
 import org.python.util.GlobMatchingTask;
 
 public class ExposeTask extends GlobMatchingTask {
@@ -32,14 +30,7 @@
             log("Exposing 1 class");
         }
 
-        // Quiet harmless unbootstrapped warnings during the expose process
-        int verbose = Options.verbose;
-        Options.verbose = Py.ERROR;
-        try {
-            expose(toExpose);
-        } finally {
-            Options.verbose = verbose;
-        }
+        expose(toExpose);
     }
 
     private void expose(Set<File> toExpose) {
diff --git a/src/org/python/modules/posix/PythonPOSIXHandler.java b/src/org/python/modules/posix/PythonPOSIXHandler.java
--- a/src/org/python/modules/posix/PythonPOSIXHandler.java
+++ b/src/org/python/modules/posix/PythonPOSIXHandler.java
@@ -4,12 +4,14 @@
 import java.io.File;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.util.logging.Level;
 
 import jnr.constants.platform.Errno;
 import jnr.posix.POSIXHandler;
 
 import org.python.core.imp;
 import org.python.core.Options;
+import org.python.core.PrePy;
 import org.python.core.Py;
 import org.python.core.PyObject;
 
@@ -19,14 +21,17 @@
  */
 public class PythonPOSIXHandler implements POSIXHandler {
 
+    @Override
     public void error(Errno error, String extraData) {
         throw Py.OSError(error, Py.newStringOrUnicode(extraData));
     }
 
+    @Override
     public void error(Errno error, String methodName, String extraData) {
         throw Py.OSError(error, Py.newStringOrUnicode(extraData));
     }
 
+    @Override
     public void unimplementedError(String methodName) {
         if (methodName.startsWith("stat.")) {
             // Ignore unimplemented FileStat methods
@@ -35,17 +40,22 @@
         throw Py.NotImplementedError(methodName);
     }
 
+    @Override
     public void warn(WARNING_ID id, String message, Object... data) {
     }
 
+    @Override
     public boolean isVerbose() {
-        return Options.verbose >= Py.DEBUG;
+        // Verbose if the general threshold for logging is FINE or lower.
+        return PrePy.getLoggingLevel().intValue() <= Level.FINE.intValue();
     }
 
+    @Override
     public File getCurrentWorkingDirectory() {
         return new File(Py.getSystemState().getCurrentWorkingDir());
     }
 
+    @Override
     public String[] getEnv() {
         PyObject items = imp.load("os").__getattr__("environ").invoke("items");
         String[] env = new String[items.__len__()];
@@ -56,18 +66,22 @@
         return env;
     }
 
+    @Override
     public InputStream getInputStream() {
         return System.in;
     }
 
+    @Override
     public PrintStream getOutputStream() {
         return System.out;
     }
 
+    @Override
     public int getPID() {
         return 0;
     }
 
+    @Override
     public PrintStream getErrorStream() {
         return System.err;
     }

-- 
Repository URL: https://hg.python.org/jython