Resolve all ruff complaints

MODULEINFO

@@ -42,6 +42,7 @@ Make: dmlc
     $(HOST)/bin/dml/python/dml/dmllex14.py
     $(HOST)/bin/dml/python/dml/dmlparse.py
     $(HOST)/bin/dml/python/dml/dmlc.py
+    $(HOST)/bin/dml/python/dml/errors.py
     $(HOST)/bin/dml/python/dml/expr.py
     $(HOST)/bin/dml/python/dml/expr_util.py
     $(HOST)/bin/dml/python/dml/globals.py
@@ -50,9 +51,9 @@ Make: dmlc
     $(HOST)/bin/dml/python/dml/int_register.py
     $(HOST)/bin/dml/python/dml/io_memory.py
     $(HOST)/bin/dml/python/dml/logging.py
-    $(HOST)/bin/dml/python/dml/messages.py
     $(HOST)/bin/dml/python/dml/objects.py
     $(HOST)/bin/dml/python/dml/output.py
+    $(HOST)/bin/dml/python/dml/porting.py
     $(HOST)/bin/dml/python/dml/provisional.py
     $(HOST)/bin/dml/python/dml/reginfo.py
     $(HOST)/bin/dml/python/dml/serialize.py
@@ -65,6 +66,7 @@ Make: dmlc
     $(HOST)/bin/dml/python/dml/topsort.py
     $(HOST)/bin/dml/python/dml/traits.py
     $(HOST)/bin/dml/python/dml/types.py
+    $(HOST)/bin/dml/python/dml/warnings.py
     $(HOST)/bin/dml/python/dml/dml12_parsetab.py
     $(HOST)/bin/dml/python/dml/dml14_parsetab.py
     $(HOST)/bin/dml/python/LICENSE

Makefile

@@ -27,23 +27,25 @@ PYFILES := dml/__init__.py			\
           dml/dmllex14.py			\
           dml/dmlparse.py			\
           dml/dmlc.py				\
+          dml/errors.py				\
           dml/expr.py				\
           dml/expr_util.py			\
 	  dml/globals.py			\
           dml/info_backend.py			\
           dml/io_memory.py			\
           dml/int_register.py			\
           dml/logging.py			\
-          dml/messages.py			\
           dml/objects.py			\
           dml/output.py				\
+          dml/porting.py			\
           dml/provisional.py			\
           dml/reginfo.py			\
           dml/serialize.py			\
           dml/set.py				\
           dml/slotsmeta.py			\
           dml/structure.py			\
           dml/symtab.py				\
+          dml/warnings.py			\
 	  __main__.py
 
 PYUNIT_FILES := $(wildcard $(DMLC_DIR)/py/dml/*_test.py)

messages_to_md.py

@@ -21,30 +21,15 @@ def fmt_message(err):
 
 def extract_messages(sys_path):
     sys.path.append(sys_path)
-    from dml import messages
-    from dml.messages import DMLError, DMLWarning
+    from dml import warnings, errors
 
-    errors = []
-    warnings = []
-
-    for n in dir(messages):
-        o = getattr(messages, n)
-        #sys.stderr.write("%s: %r\n" % (n, o))
-        if isinstance(o, type):
-            if issubclass(o, DMLError) and o is not DMLError:
-                errors.append(o)
-            elif issubclass(o, DMLWarning) and o is not DMLWarning:
-                warnings.append(o)
-
-    errors.sort(key=lambda x: x.fmt)
-    warnings.sort(key=lambda x: x.fmt)
-    return (warnings, errors)
+    return (warnings.all_warnings, errors.all_errors)
 
 def print_message_table(f, messages):
     f.write("<dl>\n")
-    for m in messages:
-        assert m.__doc__
-        f.write(f"  <dt><b>\n\n{fmt_message(m)} [{m.__name__}]</b></dt>\n")
+    for (tag, m) in sorted(messages.items()):
+        assert m.__doc__, m
+        f.write(f"  <dt><b>\n\n{fmt_message(m)} [{tag}]</b></dt>\n")
         doc = '\n'.join(line[4:] if line.startswith('    ') else line
                         for line in m.__doc__.strip().splitlines())
         f.write(f"  <dd>\n\n{doc}\n</dd>\n")
@@ -94,5 +79,8 @@ def matches_version(message, target):
     (warnings, errors) = extract_messages(args.path)
     with open(args.outfile, 'w') as f:
         print_messages(
-            f, [w for w in warnings if matches_version(w, args.version)],
-            [e for e in errors if matches_version(e, args.version)])
+            f,
+            {tag: w for (tag, w) in warnings.items()
+             if matches_version(w, args.version)},
+            {tag: e for (tag, e) in errors.items()
+             if matches_version(e, args.version)})

porting_to_md.py

@@ -5,26 +5,15 @@
 [path_to_dml, outfile] = sys.argv[1:]
 sys.path.append(path_to_dml)
 
-from dml import messages
-from dml.messages import PortingMessage
-
-portings = []
-
-for n in dir(messages):
-    o = getattr(messages, n)
-    if (isinstance(o, type) and issubclass(o, PortingMessage)
-        and o is not PortingMessage):
-        portings.append(o)
-
-portings.sort(key=lambda x: x.__name__)
+from dml.porting import all_portings
 
 with open(outfile, 'w') as f:
     f.write("# Language differences handled by the port-dml script\n\n")
 
     f.write("<dl>\n")
-    for m in portings:
+    for (tag, m) in sorted(all_portings.items()):
         assert m.__doc__
-        f.write(f"  <dt>{m.__name__}</dt>\n")
+        f.write(f"  <dt>{tag}</dt>\n")
         doc = '\n'.join(line[4:] if line.startswith('    ') else line
                         for line in m.__doc__.strip().splitlines())
         f.write(f"  <dd>\n\n{doc}\n</dd>\n")

provisional_to_md.py

@@ -8,7 +8,6 @@
 dml12_only = {'1.2': True, '1.4': False}[dml_version]
 
 from dml import provisional
-from dml.env import api_versions, default_api_version
 
 with open(outfile, 'w') as f:
     f.write(Path(header).read_text())

py/dead_dml_methods.py

@@ -115,13 +115,13 @@ def traverse_ast(ast):
 
 def method_locations(path):
     from dml.toplevel import parse_file, determine_version
-    from dml import logging, messages
+    from dml import logging, warnings
     from dml import breaking_changes
     # needed to parse 1.2/utility.dml
     breaking_changes.BreakingChange.enabled_breaking_changes = (
         set(breaking_changes.changes.values())
         - {breaking_changes.forbid_warning_statement})
-    for warning in messages.warnings:
+    for warning in warnings.all_warnings:
         logging.ignore_warning(warning)
 
     (version, _) = determine_version(path.read_text(), path)

py/dml/ast.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: MPL-2.0
 
 import builtins
-from .logging import dbg
 
 class AST(object):
     __slots__ = ('__site', '__args', 'kind')