pythonlib: Remove star imports (OSGeo#1546)

Replaces star import (from x import *) by regular imports (from x import y). Enables the relevant Flake8 warnings. Adds the warning to per-file ignores for init files where we expect and allow using star imports (unfortunately some init files contain actual code suffers from these warning being disabled, but that's a different issue).
a0x8o · Sep 5, 2024 · f32db83 · f32db83
1 parent 975e253
commit f32db83
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 0 deletions.
diff --git a/python/grass/.flake8 b/python/grass/.flake8
@@ -38,6 +38,7 @@ ignore =
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -327,6 +328,11 @@ ignore =
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
 =======
 >>>>>>> 460748a7fb (g.proj: fix reading input WKT (#1582))
+=======
+=======
+    E722, # do not use bare 'except'
+>>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
 
 per-file-ignores =
     # C wrappers call libgis.G_gisinit before importing other modules.

diff --git a/python/grass/exceptions/__init__.py b/python/grass/exceptions/__init__.py
@@ -91,6 +91,7 @@ def __init__(self, module, code, returncode, errors=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
@@ -178,6 +179,11 @@ def __init__(self, module, code, returncode, errors=None):
 =======
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
         if not module or module in code:
             # No need to include module name if it is directly in code
             # of if it is not set.

diff --git a/python/grass/gunittest/invoker.py b/python/grass/gunittest/invoker.py
@@ -899,8 +899,14 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
         returncode = p.returncode
         encodings = [_get_encoding(), "utf8", "latin-1", "ascii"]
 
+<<<<<<< HEAD
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
+<<<<<<< HEAD
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
+=======
+=======
+>>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
         def try_decode(data, encodings):
             """Try to decode data (bytes) using one of encodings
 
@@ -939,6 +945,7 @@ def try_decode(data, encodings):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1092,6 +1099,8 @@ def try_decode(data, encodings):
 =======
 >>>>>>> 4fa4b4b8fe (pythonlib: Remove star imports (#1546))
 =======
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
+=======
 >>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
                     return decode(data, encoding=encoding)
 =======
@@ -1101,6 +1110,7 @@ def try_decode(data, encodings):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 0bd7d818a8 (pythonlib: Remove star imports (#1546))
 =======
 =======
@@ -1198,6 +1208,11 @@ def try_decode(data, encodings):
                     return decode(stdout, encoding=encoding)
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
+=======
+=======
+                    return decode(stdout, encoding=encoding)
+>>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
                 except UnicodeError:
                     pass
             if isinstance(data, bytes):

diff --git a/python/grass/script/db.py b/python/grass/script/db.py
@@ -38,6 +38,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
@@ -125,6 +126,11 @@
 =======
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
 
 import os
 from .core import (

diff --git a/python/grass/script/task.py b/python/grass/script/task.py
@@ -34,6 +34,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -65,6 +66,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
 
 =======
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
@@ -82,6 +85,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -139,6 +143,8 @@
 =======
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
 import os
 import re
 import sys

diff --git a/python/grass/script/vector.py b/python/grass/script/vector.py
@@ -45,6 +45,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 from grass.exceptions import CalledModuleError, ScriptError
 =======
@@ -84,6 +85,9 @@
 =======
 >>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
 =======
+=======
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
+=======
 
 from grass.exceptions import CalledModuleError, ScriptError
 >>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
@@ -92,6 +96,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 5fb05831cc (pythonlib: Remove star imports (#1546))
 =======
 >>>>>>> osgeo-main
@@ -143,6 +148,8 @@
 =======
 =======
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
 
 from grass.exceptions import CalledModuleError, ScriptError
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))

diff --git a/python/grass/temporal/c_libraries_interface.py b/python/grass/temporal/c_libraries_interface.py
@@ -43,6 +43,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -441,22 +442,34 @@
 from ctypes import CFUNCTYPE, POINTER, byref, c_int, c_void_p, cast
 =======
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
+=======
+import sys
+from ctypes import CFUNCTYPE, POINTER, byref, c_int, c_void_p, cast
+=======
+=======
+>>>>>>> 56010eb999 (pythonlib: Remove star imports (#1546))
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
 <<<<<<< HEAD
 from ctypes import byref, cast, c_int, c_void_p, CFUNCTYPE, POINTER
 =======
 from ctypes import byref, cast, c_char_p, c_int, c_void_p, CFUNCTYPE, POINTER
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> bdc1a9eff8 (pythonlib: Remove star imports (#1546))
 <<<<<<< HEAD
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
 =======
 =======
+>>>>>>> bdc1a9eff8 (pythonlib: Remove star imports (#1546))
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
+=======
 =======
 from ctypes import byref, cast, c_char_p, c_int, c_void_p, CFUNCTYPE, POINTER
 >>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 56010eb999 (pythonlib: Remove star imports (#1546))
 <<<<<<< HEAD
 >>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
@@ -491,6 +504,9 @@
 =======
 >>>>>>> bdc1a9eff8 (pythonlib: Remove star imports (#1546))
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 56010eb999 (pythonlib: Remove star imports (#1546))
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
 from datetime import datetime
 from multiprocessing import Lock, Pipe, Process
 

diff --git a/python/grass/temporal/temporal_granularity.py b/python/grass/temporal/temporal_granularity.py
@@ -78,6 +78,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
@@ -176,7 +177,11 @@
 >>>>>>> bdc1a9eff8 (pythonlib: Remove star imports (#1546))
 >>>>>>> f4b9197871 (pythonlib: Remove star imports (#1546))
 =======
+=======
+>>>>>>> 3ced907ea6 (pythonlib: Remove star imports (#1546))
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
 from functools import reduce
 from collections import OrderedDict
 >>>>>>> bdc1a9eff8 (pythonlib: Remove star imports (#1546))