Merge pull request #855 from bartsanchez/bart/fix-ruff-rule-PLR0402

fix: Ruff rule PLR0402 (manual-from-import)

pyproject.toml

@@ -120,7 +120,6 @@ ignore = [
     "E731",
     "E741",
     "PLR0124",
-    "PLR0402",
     "PLR0911",
     "PLR0912",
     "PLR0913",

src/arch/z80/visitor/translator.py

@@ -2,10 +2,10 @@
 
 from collections import namedtuple
 
-import src.api.check as check
 import src.api.errmsg
 import src.api.global_ as gl
 import src.api.tmp_labels
+from src.api import check
 from src.api.config import OPTIONS
 from src.api.constants import CLASS, CONVENTION, SCOPE, TYPE
 from src.api.debug import __DEBUG__

src/symbols/arrayaccess.py

@@ -10,9 +10,8 @@
 
 from typing import Optional
 
-import src.api.check as check
-import src.api.errmsg as errmsg
 import src.api.global_ as gl
+from src.api import check, errmsg
 from src.api.constants import SCOPE
 from src.symbols.arglist import SymbolARGLIST
 from src.symbols.binary import SymbolBINARY as BINARY

src/symbols/binary.py

@@ -8,8 +8,7 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-import src.api.check as check
-import src.api.errmsg as errmsg
+from src.api import check, errmsg
 from src.symbols.constexpr import SymbolCONSTEXPR
 from src.symbols.number import SymbolNUMBER
 from src.symbols.string_ import SymbolSTRING

src/symbols/block.py

@@ -8,7 +8,7 @@
 #                    the GNU General License v3
 # ----------------------------------------------------------------------
 
-import src.api.check as check
+from src.api import check
 
 from .symbol_ import Symbol
 

src/symbols/builtin.py

@@ -7,7 +7,7 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-import src.api.check as check
+from src.api import check
 
 from .number import SymbolNUMBER
 from .symbol_ import Symbol

src/symbols/call.py

@@ -11,9 +11,8 @@
 from collections.abc import Iterable
 from typing import Optional
 
-import src.api.check as check
-import src.api.errmsg as errmsg
 import src.api.global_ as gl
+from src.api import check, errmsg
 from src.api.constants import CLASS
 from src.symbols.arglist import SymbolARGLIST
 from src.symbols.argument import SymbolARGUMENT

src/symbols/strslice.py

@@ -8,9 +8,8 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-import src.api.check as check
-import src.api.config as config
 import src.api.global_ as gl
+from src.api import check, config
 from src.symbols.binary import SymbolBINARY as BINARY
 from src.symbols.number import SymbolNUMBER as NUMBER
 from src.symbols.string_ import SymbolSTRING as STRING

src/symbols/unary.py

@@ -8,7 +8,7 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-import src.api.check as check
+from src.api import check
 from src.symbols.number import SymbolNUMBER
 from src.symbols.string_ import SymbolSTRING
 from src.symbols.symbol_ import Symbol

src/zxbasm/asmparse.py

@@ -13,12 +13,12 @@
 import os
 
 import src.api.utils
-import src.ply.yacc as yacc
 from src import outfmt
 from src.api import global_ as gl
 from src.api.config import OPTIONS
 from src.api.debug import __DEBUG__
 from src.api.errmsg import error, warning
+from src.ply import yacc
 from src.zxbasm import asmlex, basic
 from src.zxbasm import global_ as asm_gl
 from src.zxbasm.asm import Asm, Container

src/zxbpp/prepro/builtinmacro.py

@@ -1,4 +1,4 @@
-import src.zxbpp.prepro as prepro
+from src.zxbpp import prepro
 
 from .id_ import ID
 from .macrocall import MacroCall

src/zxbpp/prepro/id_.py

@@ -8,8 +8,8 @@
 import copy
 import sys
 
-import src.zxbpp.prepro as prepro
 from src.api.debug import __DEBUG__
+from src.zxbpp import prepro
 
 from .macrocall import MacroCall
 from .output import CURRENT_FILE

src/zxbpp/prepro/macrocall.py

@@ -5,8 +5,8 @@
 import re
 from typing import Union
 
-import src.zxbpp.prepro as prepro
 from src.api.debug import __DEBUG__
+from src.zxbpp import prepro
 
 from .exceptions import PreprocError
 

tests/symbols/test_symbolARRAYACCESS.py

@@ -3,8 +3,8 @@
 from io import StringIO
 from unittest import TestCase
 
-import src.api.config as config
 import src.api.global_ as gl
+from src.api import config
 from src.api.symboltable.symboltable import SymbolTable
 from src.symbols import sym
 from src.symbols.type_ import Type