more work to satisfy ruff

Author: gvwilson

_plotly_utils/basevalidators.py

@@ -7,7 +7,6 @@
 import io
 import re
 import sys
-import warnings
 import narwhals.stable.v1 as nw
 
 from _plotly_utils.optional_imports import get_module

_plotly_utils/colors/qualitative.py

@@ -151,7 +151,7 @@ def swatches(template=None):
 Plotly_r = Plotly[::-1]
 T10_r = T10[::-1]
 
-from .colorbrewer import (  # noqa: F401
+from .colorbrewer import (  # noqa: E402 F401
     Set1,
     Pastel1,
     Dark2,
@@ -165,7 +165,7 @@ def swatches(template=None):
     Pastel2_r,
     Set3_r,
 )
-from .carto import (  # noqa: F401
+from .carto import (  # noqa: E402 F401
     Antique,
     Bold,
     Pastel,

_plotly_utils/colors/sequential.py

@@ -124,7 +124,7 @@ def swatches_continuous(template=None):
 Turbo_r = Turbo[::-1]
 Viridis_r = Viridis[::-1]
 
-from .plotlyjs import (  # noqa: F401
+from .plotlyjs import (  # noqa: E402 F401
     Blackbody,
     Bluered,
     Electric,
@@ -139,7 +139,7 @@ def swatches_continuous(template=None):
     Rainbow_r,
 )
 
-from .colorbrewer import (  # noqa: F401
+from .colorbrewer import (  # noqa: E402 F401
     Blues,
     BuGn,
     BuPu,
@@ -180,7 +180,7 @@ def swatches_continuous(template=None):
     YlOrRd_r,
 )
 
-from .cmocean import (  # noqa: F401
+from .cmocean import (  # noqa: E402 F401
     turbid,
     thermal,
     haline,
@@ -209,7 +209,7 @@ def swatches_continuous(template=None):
     tempo_r,
 )
 
-from .carto import (  # noqa: F401
+from .carto import (  # noqa: E402 F401
     Burg,
     Burgyl,
     Redor,

_plotly_utils/png.py

@@ -842,7 +842,7 @@ def write_array(self, outfile, pixels):
         """
 
         if self.interlace:
-            if type(pixels) != array:
+            if not isarray(pixels):
                 # Coerce to array type
                 fmt = "BH"[self.bitdepth > 8]
                 pixels = array(fmt, pixels)

_plotly_utils/utils.py

@@ -469,12 +469,12 @@ def display_string_positions(p, i=None, offset=0, length=1, char="^", trim=True)
     maxaddr = 0
     if i is None:
         for p_ in p:
-            for l in range(length):
-                maxaddr = p_ + offset + l
+            for temp in range(length):
+                maxaddr = p_ + offset + temp
                 s[maxaddr] = char
     else:
-        for l in range(length):
-            maxaddr = p[i] + offset + l
+        for temp in range(length):
+            maxaddr = p[i] + offset + temp
             s[maxaddr] = char
     ret = "".join(s)
     if trim:
@@ -501,8 +501,8 @@ def chomp_empty_strings(strings, c, reverse=False):
     on the right or "" if it is the last string.
     """
 
-    def _rev(l):
-        return [s[::-1] for s in l][::-1]
+    def _rev(vals):
+        return [s[::-1] for s in vals][::-1]
 
     if reverse:
         return _rev(chomp_empty_strings(_rev(strings), c))

codegen/__init__.py

@@ -322,9 +322,10 @@ def __getattr__(import_name):
     graph_objects_path = opath.join(outdir, "graph_objects", "__init__.py")
     os.makedirs(opath.join(outdir, "graph_objects"), exist_ok=True)
     with open(graph_objects_path, "wt") as f:
+        f.write("# ruff: noqa: F401\n")
         f.write(graph_objects_init_source)
 
-    # Run black code formatter on output directories
+    # Run code formatter on output directories
     if noformat:
         print("skipping reformatting")
     else:

plotly/basedatatypes.py

@@ -36,15 +36,15 @@ def _len_dict_item(item):
     convert to a string before calling len on it.
     """
     try:
-        l = len(item)
+        temp = len(item)
     except TypeError:
         try:
-            l = len("%d" % (item,))
+            temp = len("%d" % (item,))
         except TypeError:
             raise ValueError(
                 "Cannot find string length of an item that is not string-like nor an integer."
             )
-    return l
+    return temp
 
 
 def _str_to_dict_path_full(key_path_str):
@@ -105,7 +105,7 @@ def _split_and_chomp(s):
         # the list ("lift" the items out of the sublists)
         key_path2c = list(
             reduce(
-                lambda x, y: x + y if type(y) == type(list()) else x + [y],
+                lambda x, y: x + y if isinstance(y, list) else x + [y],
                 map(_split_and_chomp, key_path2b),
                 [],
             )
@@ -140,7 +140,7 @@ def _remake_path_from_tuple(props):
         return ""
 
     def _add_square_brackets_to_number(n):
-        if type(n) == type(int()):
+        if isinstance(n, int):
             return "[%d]" % (n,)
         return n
 

plotly/exceptions.py

@@ -1 +1 @@
-from _plotly_utils.exceptions import *
+from _plotly_utils.exceptions import PlotlyError  # noqa: F401

plotly/files.py

@@ -1 +1 @@
-from _plotly_utils.files import *
+from _plotly_utils.files import PLOTLY_DIR, ensure_writable_plotly_dir  # noqa: F401

plotly/graph_objects/__init__.py

@@ -1,3 +1,4 @@
+# ruff: noqa: F401
 import sys
 from typing import TYPE_CHECKING
 

plotly/optional_imports.py

@@ -1 +1 @@
-from _plotly_utils.optional_imports import get_module
+from _plotly_utils.optional_imports import get_module  # noqa: F401

plotly/tools.py

@@ -500,10 +500,10 @@ def _replace_newline(obj):
             d[key] = _replace_newline(val)
         return d
     elif isinstance(obj, list):
-        l = list()
+        temp = list()
         for index, entry in enumerate(obj):
-            l += [_replace_newline(entry)]
-        return l
+            temp += [_replace_newline(entry)]
+        return temp
     elif isinstance(obj, str):
         s = obj.replace("\n", "<br>")
         if s != obj:
@@ -704,7 +704,7 @@ def get_config_plotly_server_url():
             config_dict = json.load(f)
             if not isinstance(config_dict, dict):
                 config_dict = {}
-        except:
+        except Exception:
             # TODO: issue a warning and bubble it up
             config_dict = {}
 

plotly/utils.py

@@ -1,8 +1,8 @@
 import textwrap
 from pprint import PrettyPrinter
 
-from _plotly_utils.utils import *
-from _plotly_utils.data_utils import *
+from _plotly_utils.utils import NotEncodable, PlotlyJSONEncoder, get_module  # noqa: F401
+from _plotly_utils.data_utils import image_array_to_data_uri  # noqa: F401
 
 
 # Pretty printing

tests/test_plotly_utils/validators/test_colorscale_validator.py

@@ -79,9 +79,9 @@ def test_acceptance_sequence(seqence_colorscale, validator):
 @pytest.mark.parametrize(
     "val",
     [
-        ((0, "red"),),
-        ((0.1, "rgb(255,0,0)"), (0.3, "green")),
-        ((0, "purple"), (0.2, "yellow"), (1.0, "rgba(255,0,0,100)")),
+        [[0, "red"]],
+        [[0.1, "rgb(255,0,0)"], [0.3, "green"]],
+        [[0, "purple"], [0.2, "yellow"], [1.0, "rgba(255,0,0,100)"]],
     ],
 )
 def test_acceptance_array_1(val, validator):

tests/test_plotly_utils/validators/test_enumerated_validator.py

@@ -4,7 +4,6 @@
 from _plotly_utils.basevalidators import EnumeratedValidator
 from ...test_optional.test_utils.test_utils import np_inf
 
-
 # Fixtures
 
 @pytest.fixture()
@@ -35,7 +34,7 @@ def validator_aok_re():
 
 # Acceptance
 @pytest.mark.parametrize("val", ["first", "second", "third", 4])
-def test_acceptance_1(val, validator):
+def test_acceptance_no_array(val, validator):
     # Values should be accepted and returned unchanged
     assert validator.validate_coerce(val) == val
 
@@ -45,7 +44,7 @@ def test_acceptance_1(val, validator):
     "val",
     [True, 0, 1, 23, np_inf(), set(), ["first", "second"], [True], ["third", 4], [4]],
 )
-def test_rejection_by_value_1(val, validator):
+def test_rejection_by_value_with_validator(val, validator):
     with pytest.raises(ValueError) as validation_failure:
         validator.validate_coerce(val)
 
@@ -55,14 +54,14 @@ def test_rejection_by_value_1(val, validator):
 # Array not ok, regular expression
 
 @pytest.mark.parametrize("val", ["foo", "bar0", "bar1", "bar234"])
-def test_acceptance_2(val, validator_re):
+def test_acceptance(val, validator_re):
     # Values should be accepted and returned unchanged
     assert validator_re.validate_coerce(val) == val
 
 
 # Value Rejection
 @pytest.mark.parametrize("val", [12, set(), "bar", "BAR0", "FOO"])
-def test_rejection_by_value_2(val, validator_re):
+def test_rejection_by_value_with_regexp(val, validator_re):
     with pytest.raises(ValueError) as validation_failure:
         validator_re.validate_coerce(val)
 
@@ -86,13 +85,9 @@ def test_rejection_by_value_2(val, validator_re):
         ["first", "second", "third", 4],
     ],
 )
-def test_acceptance_aok_1(val, validator_aok):
+def test_acceptance_array_ok(val, validator_aok):
     # Values should be accepted and returned unchanged
-    coerce_val = validator_aok.validate_coerce(val)
-    if isinstance(val, (list, np.ndarray)):
-        assert np.array_equal(coerce_val, np.array(val, dtype=coerce_val.dtype))
-    else:
-        assert coerce_val == val
+    assert val == validator_aok.validate_coerce(val)
 
 
 # Rejection by value
@@ -108,7 +103,7 @@ def test_rejection_by_value_aok(val, validator_aok):
 @pytest.mark.parametrize(
     "val", [[True], [0], [1, 23], [np_inf(), set()], ["ffirstt", "second", "third"]]
 )
-def test_rejection_by_element_aok_1(val, validator_aok):
+def test_rejection_by_element_array_ok(val, validator_aok):
     with pytest.raises(ValueError) as validation_failure:
         validator_aok.validate_coerce(val)
 
@@ -132,7 +127,7 @@ def test_rejection_by_element_aok_1(val, validator_aok):
         np.array(["foo", "bar012", "baz"]),
     ],
 )
-def test_acceptance_aok_2(val, validator_aok_re):
+def test_acceptance_array_ok_re(val, validator_aok_re):
     # Values should be accepted and returned unchanged
     coerce_val = validator_aok_re.validate_coerce(val)
     if isinstance(val, (np.ndarray, pd.Series)):
@@ -145,7 +140,7 @@ def test_acceptance_aok_2(val, validator_aok_re):
 
 # Reject by elements
 @pytest.mark.parametrize("val", [["bar", "bar0"], ["foo", 123]])
-def test_rejection_by_element_aok_2(val, validator_aok_re):
+def test_rejection_by_element_array_ok_re(val, validator_aok_re):
     with pytest.raises(ValueError) as validation_failure:
         validator_aok_re.validate_coerce(val)