flake code

Author: gselzer

setup.cfg

@@ -54,3 +54,8 @@ dev =
     numpy
     pandas
     setuptools-scm
+
+[flake8]
+# See https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8
+max-line-length = 88
+extend-ignore = E203

src/scyjava/__init__.py

@@ -14,7 +14,16 @@
 import sys
 from pathlib import Path
 from typing import Dict
-from jpype.types import *
+from jpype.types import (
+    JArray,
+    JBoolean,
+    JChar,
+    JDouble,
+    JFloat,
+    JInt,
+    JLong,
+    JShort,
+)
 from _jpype import _JObject
 
 _logger = logging.getLogger(__name__)
@@ -72,7 +81,7 @@ def ___version__():
         pass
     # Third pass: use pkg_resources
     try:
-        from pkg_resources import get_distribution, DistributionNotFound
+        from pkg_resources import get_distribution
 
         return get_distribution("scyjava").version
     except ImportError:
@@ -89,21 +98,27 @@ def ___version__():
 
 def jvm_version():
     """
-    Gets the version of the JVM as a tuple, with each dot-separated digit as one element.
-    Characters in the version string beyond only numbers and dots are ignored, in line
+    Gets the version of the JVM as a tuple,
+    with each dot-separated digit as one element.
+    Characters in the version string beyond only
+    numbers and dots are ignored, in line
     with the java.version system property.
 
     Examples:
     * OpenJDK 17.0.1 -> [17, 0, 1]
     * OpenJDK 11.0.9.1-internal -> [11, 0, 9, 1]
     * OpenJDK 1.8.0_312 -> [1, 8, 0]
 
-    If the JVM is already started, this function should return the equivalent of:
-       jimport('java.lang.System').getProperty('java.version').split('.')
+    If the JVM is already started,
+    this function should return the equivalent of:
+       jimport('java.lang.System')
+         .getProperty('java.version')
+         .split('.')
 
-    In case the JVM is not started yet, a best effort is made to deduce the
-    version from the environment without actually starting up the JVM in-process.
-    If the version cannot be deduced, a RuntimeError with the cause is raised.
+    In case the JVM is not started yet,a best effort is made to deduce
+    the version from the environment without actually starting up the
+    JVM in-process. If the version cannot be deduced, a RuntimeError
+    with the cause is raised.
     """
     jvm_version = jpype.getJVMVersion()
     if jvm_version and jvm_version[0]:
@@ -113,7 +128,8 @@ def jvm_version():
         return jvm_version
 
     # JPype was clueless, which means the JVM has probably not started yet.
-    # Let's look for a java executable, and ask it directly with 'java -version'.
+    # Let's look for a java executable, and ask it directly with 'java
+    # -version'.
 
     default_jvm_path = jpype.getDefaultJVMPath()
     if not default_jvm_path:
@@ -215,7 +231,7 @@ def start_jvm(options=scyjava.config.get_options()):
             for libjvm_path, java_home_path in libjvm_paths.items():
                 if (base / libjvm_path).exists():
                     java_home = str((base / java_home_path).resolve())
-                    _logger.debug(f"Detected JAVA_HOME: %s", java_home)
+                    _logger.debug(f"Detected JAVA_HOME: {java_home}")
                     os.environ["JAVA_HOME"] = java_home
                     break
 
@@ -465,7 +481,7 @@ def jstacktrace(exc):
         sw = StringWriter()
         exc.printStackTrace(PrintWriter(sw, True))
         return sw.toString()
-    except:
+    except BaseException:
         return ""
 
 
@@ -528,6 +544,10 @@ def to_java(obj: Any) -> Any:
     return _convert(obj, java_converters)
 
 
+def _is_a_long(obj) -> bool:
+    return isinstance(obj, int) and obj <= Long.MAX_VALUE
+
+
 def _stock_java_converters() -> typing.List[Converter]:
     """
     Returns all python-to-java converters supported out of the box!
@@ -572,7 +592,7 @@ def _stock_java_converters() -> typing.List[Converter]:
         ),
         # Long converter
         Converter(
-            predicate=lambda obj: isinstance(obj, int) and obj <= Long.MAX_VALUE,
+            predicate=_is_a_long,
             converter=Long,
             priority=Priority.NORMAL - 1,
         ),
@@ -628,9 +648,12 @@ def _stock_java_converters() -> typing.List[Converter]:
     ]
 
 
-when_jvm_starts(
-    lambda: [_add_converter(c, java_converters) for c in _stock_java_converters()]
-)
+def _initialize_converters():
+    for converter in _stock_java_converters():
+        _add_converter(converter, java_converters)
+
+
+when_jvm_starts(_initialize_converters)
 
 
 # -- Java to Python --
@@ -649,7 +672,7 @@ def __init__(self, jobj, intended_class=None):
             intended_class = Object
         if not isinstance(jobj, intended_class):
             raise TypeError(
-                "Not a " + intended_class.getName() + ": " + jclass(jobj).getName()
+                f"Not a {intended_class.getName()}: {jclass(jobj).getName()}"
             )
         self.jobj = jobj
 
@@ -713,15 +736,17 @@ def __getitem__(self, key):
         return to_python(self.jobj.get(key), gentle=True)
 
     def __setitem__(self, key, value):
-        # NB: List.set(int, Object) returns inserted element, so be gentle here.
+        # NB: List.set(int, Object) returns inserted element, so be gentle
+        # here.
         return to_python(self.jobj.set(key, to_java(value)), gentle=True)
 
     def __delitem__(self, key):
         # NB: List.remove(Object) returns boolean, so no need for gentleness.
         return to_python(self.jobj.remove(to_java(key)))
 
     def insert(self, index, object):
-        # NB: List.set(int, Object) returns inserted element, so be gentle here.
+        # NB: List.set(int, Object) returns inserted element, so be gentle
+        # here.
         return to_python(self.jobj.set(index, to_java(object)), gentle=True)
 
 
@@ -735,8 +760,10 @@ def __getitem__(self, key):
         return to_python(self.jobj.get(to_java(key)), gentle=True)
 
     def __setitem__(self, key, value):
-        # NB: Map.put(Object, Object) returns inserted value, so be gentle here.
-        return to_python(self.jobj.put(to_java(key), to_java(value)), gentle=True)
+        # NB: Map.put(Object, Object) returns inserted value, so be gentle
+        # here.
+        put_return: bool = self.jobj.put(to_java(key), to_java(value))
+        return to_python(put_return, gentle=True)
 
     def __delitem__(self, key):
         # NB: Map.remove(Object) returns the removed key, so be gentle here.
@@ -756,16 +783,17 @@ def __eq__(self, other):
             if len(self) != len(other):
                 return False
             for k in self:
-                if not k in other or self[k] != other[k]:
+                if k not in other or self[k] != other[k]:
                     return False
             return True
         except TypeError:
             return False
 
     def __str__(self):
-        return (
-            "{" + ", ".join(_jstr(k) + ": " + _jstr(v) for k, v in self.items()) + "}"
-        )
+        def item_str(k, v):
+            return _jstr(k) + ": " + _jstr(v)
+
+        return "{" + ", ".join(item_str(k, v) for k, v in self.items()) + "}"
 
 
 class JavaSet(JavaCollection, collections.abc.MutableSet):
@@ -788,7 +816,7 @@ def __eq__(self, other):
             if len(self) != len(other):
                 return False
             for k in self:
-                if not k in other:
+                if k not in other:
                     return False
             return True
         except TypeError:
@@ -998,7 +1026,7 @@ def _is_table(obj: Any) -> bool:
     """Checks if obj is a table"""
     try:
         return isinstance(obj, jimport("org.scijava.table.Table"))
-    except:
+    except BaseException:
         # No worries if scijava-table is not available.
         pass
 
@@ -1007,7 +1035,7 @@ def _convert_table(obj: Any):
     """Converts obj to a table."""
     try:
         return _table_to_pandas(obj)
-    except:
+    except BaseException:
         # No worries if scijava-table is not available.
         pass
 
@@ -1037,8 +1065,6 @@ def _table_to_pandas(table):
 
 
 def _pandas_to_table(df):
-    pd = _import_pandas()
-
     if len(df.dtypes.unique()) > 1:
         TableClass = jimport("org.scijava.table.DefaultGenericTable")
     else:

src/scyjava/config/__init__.py

@@ -22,7 +22,8 @@ def add_endpoints(*new_endpoints):
     Please modify the endpoints field directly instead.
     """
     _logger.warning(
-        "Deprecated method call: scyjava.config.add_endpoints(). Please modify scyjava.config.endpoints directly instead."
+        "Deprecated method call: scyjava.config.add_endpoints(). "
+        "Please modify scyjava.config.endpoints directly instead."
     )
     global endpoints
     _logger.debug("Adding endpoints %s to %s", new_endpoints, endpoints)
@@ -35,7 +36,8 @@ def get_endpoints():
     Please access the endpoints field directly instead.
     """
     _logger.warning(
-        "Deprecated method call: scyjava.config.get_endpoints(). Please access scyjava.config.endpoints directly instead."
+        "Deprecated method call: scyjava.config.get_endpoints(). "
+        "Please access scyjava.config.endpoints directly instead."
     )
     global endpoints
     return endpoints