new Black, new opinions. and some linter complaint fixes

Author: rambo

examples/hp6632b_serial.py

@@ -7,6 +7,8 @@
 from scpi.devices import hp6632b
 from scpi.wrapper import AIOWrapper
 
+# pylint: disable=R0801
+
 if __name__ == "__main__":
     if len(sys.argv) < 2:
         print(f"run with python -i {__file__} /dev/ttyUSB0")

examples/prologix_usb.py

@@ -10,6 +10,8 @@
 from scpi.devices.hp6632b import HP6632B
 from scpi.devices.generic import MultiMeter
 
+# pylint: disable=R0801
+
 if __name__ == "__main__":
     if len(sys.argv) < 2:
         print(f"run with python -i {__file__} /dev/ttyUSB0")

pyproject.toml

@@ -37,7 +37,7 @@ addopts="--cov=scpi --cov-branch"
 max-line-length = 120
 
 [tool.pylint.messages_control]
-disable=["fixme", "W1202", "C0330"]
+disable=["fixme", "W1202", "C0209"]
 
 [tool.coverage.run]
 omit = ["tests/*"]

src/scpi/__init__.py

@@ -1,5 +1,6 @@
 """SCPI module, the scpi class implements the base command set, devices may extend it.
 transports are separate from devices (so you can use for example hp6632b with either serial port or GPIB)"""
+
 __version__ = "2.4.0"  # NOTE Use `bump2version --config-file patch` to bump versions correctly
 from .scpi import SCPIProtocol, SCPIDevice
 from .errors import CommandError

src/scpi/devices/TDKLambdaZPlus.py

@@ -1,4 +1,5 @@
 """TDK Lambda power supplies"""
+
 # pylint: disable=C0103
 from typing import Optional, Union, Any
 from dataclasses import dataclass, field
@@ -256,7 +257,7 @@ def tcp(ipaddr: str, port: int) -> TDKLambdaZplus:
 
 
 def serial(serial_url: str, baudrate: int = 9600) -> TDKLambdaZplus:
-    """ Quick helper to connect via serial """
+    """Quick helper to connect via serial"""
     port = pyserial.serial_for_url(
         serial_url,
         baudrate=baudrate,

src/scpi/devices/generic.py

@@ -1,4 +1,5 @@
 """Mixins for different device functionalities"""
+
 import decimal
 
 from ..scpi import SCPIDevice

src/scpi/devices/hp6632b.py

@@ -1,4 +1,5 @@
 """HP/Agilent 3362B specific device implementation and helpers"""
+
 from typing import Any
 import logging
 import decimal

src/scpi/errors/__init__.py

@@ -1,4 +1,5 @@
 """SCPI module specific errors"""
+
 from typing import Any
 
 

src/scpi/scpi.py

@@ -1,4 +1,5 @@
 """Generic SCPI commands, allow sending and reading of raw data, helpers to parse information"""
+
 from typing import Any, Tuple, Sequence, Union, Optional, cast
 import asyncio
 import re
@@ -14,6 +15,7 @@
 ERROR_RE = re.compile(r'([+-]?\d+),"(.*?)"')
 LOGGER = logging.getLogger(__name__)
 
+
 # FIXME rename to mixin and use as such
 class BitEnum:  # pylint: disable=R0903
     """Baseclass for bit definitions of various status registers"""
@@ -234,7 +236,7 @@ async def _ask(command: str) -> str:
             if auto_check_error:
                 await self.check_error(command)
             if abort_on_timeout:
-                self.abort_command()
+                await self.abort_command()
             # re-raise the timeout if no other error found
             raise err
         except asyncio.CancelledError:

src/scpi/transports/__init__.py

@@ -1,3 +1,4 @@
 """Transport layers for the SCPI module"""
+
 from .rs232 import RS232Transport
 from .tcp import TCPTransport