PEP8 optimize imports (etingof#242)

To make them PEP8-compliant

.flake8

@@ -0,0 +1,4 @@
+[flake8]
+import-order-style = smarkets
+exclude = .git,__pycache__,docs/source/conf.py,old,build,dist,pysnmp/smi/mibs
+ignore = D100, D101, D102, D103, D104, D105, D107, D400, D401, E203, E266, E722, E501, W503, F403, F401, I202, N801, N802, N803, N806, N815, N818, RST304

pyproject.toml

@@ -45,6 +45,10 @@ black = "23.1.0"
 pre-commit = "2.21.0"
 doc8 = "^1.0.0"
 sphinx-notfound-page = "^1.0.0"
+flake8 = "5.0.4"
+flake8-import-order = "^0.18.2"
+flake8-docstrings = "^1.7.0"
+flake8-rst-docstrings = "^0.3.0"
 
 [tool.poetry_bumpversion.file."pysnmp/__init__.py"]
 

pysnmp/carrier/asyncio/dgram/base.py

@@ -34,15 +34,15 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+import asyncio
 import sys
 import traceback
 from socket import socket
+
+from pysnmp import debug
+from pysnmp.carrier import error
 from pysnmp.carrier.asyncio.base import AbstractAsyncioTransport
 from pysnmp.carrier.base import AbstractTransportAddress
-from pysnmp.carrier import error
-from pysnmp import debug
-
-import asyncio
 
 
 class DgramAsyncioProtocol(asyncio.DatagramProtocol, AbstractAsyncioTransport):

pysnmp/carrier/asyncio/dgram/udp.py

@@ -30,11 +30,13 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 #
+
 import socket
-from typing import Tuple
 import warnings
-from pysnmp.carrier.base import AbstractTransportAddress
+from typing import Tuple
+
 from pysnmp.carrier.asyncio.dgram.base import DgramAsyncioProtocol
+from pysnmp.carrier.base import AbstractTransportAddress
 
 DOMAIN_NAME: Tuple[int, ...]
 SNMP_UDP6_DOMAIN: Tuple[int, ...]

pysnmp/carrier/asyncio/dgram/udp6.py

@@ -4,11 +4,13 @@
 # Copyright (c) 2005-2020, Ilya Etingof <etingof@gmail.com>
 # License: https://www.pysnmp.com/pysnmp/license.html
 #
+
 import socket
-from typing import Tuple
 import warnings
-from pysnmp.carrier.base import AbstractTransportAddress
+from typing import Tuple
+
 from pysnmp.carrier.asyncio.dgram.base import DgramAsyncioProtocol
+from pysnmp.carrier.base import AbstractTransportAddress
 
 DOMAIN_NAME: Tuple[int, ...]
 SNMP_UDP6_DOMAIN: Tuple[int, ...]

pysnmp/carrier/asyncio/dispatch.py

@@ -33,15 +33,15 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 #
+import asyncio
 import sys
-from time import time
 import traceback
+from time import time
 from typing import Tuple
+
 from pysnmp.carrier.base import AbstractTransport, AbstractTransportDispatcher
 from pysnmp.error import PySnmpError
 
-import asyncio
-
 
 class AsyncioDispatcher(AbstractTransportDispatcher):
     """AsyncioDispatcher based on asyncio event loop"""

pysnmp/carrier/base.py

@@ -6,8 +6,8 @@
 # License: https://www.pysnmp.com/pysnmp/license.html
 #
 from typing import Any, Callable
+
 from pysnmp.carrier import error
-from typing import Callable
 
 
 class TimerCallable:

pysnmp/carrier/sockmsg.py

@@ -15,12 +15,12 @@
 # Parts of the code below is taken from:
 # http://carnivore.it/2012/10/12/python3.3_sendmsg_and_recvmsg
 #
-from pysnmp import debug
-
 import ctypes
 import ipaddress
 import socket
 
+from pysnmp import debug
+
 
 uint32_t = ctypes.c_uint32
 in_addr_t = uint32_t

pysnmp/debug.py

@@ -5,11 +5,11 @@
 # License: https://www.pysnmp.com/pysnmp/license.html
 #
 import logging
+import warnings
+
 from pyasn1.compat.octets import octs2ints
-from pysnmp import error
-from pysnmp import __version__
 
-import warnings
+from pysnmp import __version__, error
 
 
 def __getattr__(attr: str):

pysnmp/entity/config.py

@@ -5,19 +5,19 @@
 # License: https://www.pysnmp.com/pysnmp/license.html
 #
 import warnings
+
 from pyasn1.compat.octets import null
+
+from pysnmp import debug, error
 from pysnmp.carrier.asyncio.dgram import udp, udp6
 from pysnmp.carrier.base import AbstractTransport
 from pysnmp.entity.engine import SnmpEngine
+from pysnmp.proto import rfc1902, rfc1905
+from pysnmp.proto.secmod.eso.priv import aes192, aes256, des3
 from pysnmp.proto.secmod.rfc3414.auth import hmacmd5, hmacsha, noauth
 from pysnmp.proto.secmod.rfc3414.priv import des, nopriv
 from pysnmp.proto.secmod.rfc3826.priv import aes
 from pysnmp.proto.secmod.rfc7860.auth import hmacsha2
-from pysnmp.proto.secmod.eso.priv import des3, aes192, aes256
-from pysnmp.proto import rfc1902
-from pysnmp.proto import rfc1905
-from pysnmp import error
-from pysnmp import debug
 
 # Old to new attribute mapping
 deprecated_attributes = {
@@ -61,8 +61,8 @@ def __getattr__(attr: str):
 # A shortcut to popular constants
 
 # Transports
-snmpUDPDomain = udp.SNMP_UDP_DOMAIN
-snmpUDP6Domain = udp6.SNMP_UDP6_DOMAIN
+SNMP_UDP_DOMAIN = udp.SNMP_UDP_DOMAIN
+SNMP_UDP6_DOMAIN = udp6.SNMP_UDP6_DOMAIN
 
 # Auth protocol
 USM_AUTH_HMAC96_MD5 = hmacmd5.HmacMd5.SERVICE_ID
@@ -395,8 +395,6 @@ def delV3User(
     userName,
     securityEngineId=None,
 ):
-    if securityEngineId is None:  # backward compatibility
-        securityEngineId = contextEngineId
     (
         securityEngineId,
         usmUserEntry,
@@ -516,13 +514,13 @@ def addTargetAddr(
         snmpEngine, addrName
     )
 
-    if transportDomain[: len(snmpUDPDomain)] == snmpUDPDomain:
+    if transportDomain[: len(SNMP_UDP_DOMAIN)] == SNMP_UDP_DOMAIN:
         (SnmpUDPAddress,) = mibBuilder.importSymbols("SNMPv2-TM", "SnmpUDPAddress")
         transportAddress = SnmpUDPAddress(transportAddress)
         if sourceAddress is None:
             sourceAddress = ("0.0.0.0", 0)
         sourceAddress = SnmpUDPAddress(sourceAddress)
-    elif transportDomain[: len(snmpUDP6Domain)] == snmpUDP6Domain:
+    elif transportDomain[: len(SNMP_UDP6_DOMAIN)] == SNMP_UDP6_DOMAIN:
         (TransportAddressIPv6,) = mibBuilder.importSymbols(
             "TRANSPORT-ADDRESS-MIB", "TransportAddressIPv6"
         )
@@ -616,8 +614,8 @@ def delTransport(snmpEngine: SnmpEngine, transportDomain: "tuple[int, ...]"):
     return transport
 
 
-addSocketTransport = addTransport
-delSocketTransport = delTransport
+addSocketTransport = addTransport  # noqa: N816
+delSocketTransport = delTransport  # noqa: N816
 
 
 # VACM shortcuts

pysnmp/entity/engine.py

@@ -9,21 +9,23 @@
 import sys
 import tempfile
 from typing import Any
+
 from pyasn1.compat.octets import str2octs
+
+
+from pysnmp import debug, error
 from pysnmp.carrier.base import AbstractTransportAddress, AbstractTransportDispatcher
-from pysnmp.proto.rfc1902 import OctetString
-from pysnmp.proto.rfc3412 import MsgAndPduDispatcher
+from pysnmp.entity import observer
+from pysnmp.proto.acmod import rfc3415, void
 from pysnmp.proto.mpmod.rfc2576 import (
     SnmpV1MessageProcessingModel,
     SnmpV2cMessageProcessingModel,
 )
 from pysnmp.proto.mpmod.rfc3412 import SnmpV3MessageProcessingModel
+from pysnmp.proto.rfc1902 import OctetString
+from pysnmp.proto.rfc3412 import MsgAndPduDispatcher
 from pysnmp.proto.secmod.rfc2576 import SnmpV1SecurityModel, SnmpV2cSecurityModel
 from pysnmp.proto.secmod.rfc3414 import SnmpUSMSecurityModel
-from pysnmp.proto.acmod import rfc3415, void
-from pysnmp.entity import observer
-from pysnmp import debug
-from pysnmp import error
 
 __all__ = ["SnmpEngine"]
 

pysnmp/entity/observer.py

@@ -8,11 +8,11 @@
 
 
 class MetaObserver:
-    """This is a simple facility for exposing internal SNMP Engine
-    working details to pysnmp applications. These details are
-    basically local scope variables at a fixed point of execution.
+    r"""This is a simple facility for exposing internal SNMP Engine working details to pysnmp applications.
+
+    These details are basically local scope variables at a fixed point of
+    execution. Two modes of operations are offered:
 
-    Two modes of operations are offered:
     1. Consumer: app can request an execution point context by execution point ID.
     2. Provider: app can register its callback function (and context) to be invoked
        once execution reaches specified point. All local scope variables

pysnmp/entity/rfc3413/cmdgen.py

@@ -5,16 +5,19 @@
 # License: https://www.pysnmp.com/pysnmp/license.html
 #
 import sys
+
+from pyasn1.type import univ
+
+
+from pysnmp import debug, error, nextid
 from pysnmp.entity.engine import SnmpEngine
 from pysnmp.entity.rfc3413 import config
-from pysnmp.proto import rfc1905, errind
+from pysnmp.proto import errind, rfc1905
 from pysnmp.proto.api import v2c
-from pysnmp.proto.proxy import rfc2576
-from pysnmp import error, nextid, debug
 from pysnmp.proto.error import StatusInformation
-from pyasn1.type import univ
+from pysnmp.proto.proxy import rfc2576
 
-getNextHandle = nextid.Integer(0x7FFFFFFF)
+getNextHandle = nextid.Integer(0x7FFFFFFF)  # noqa: N816
 
 __null = univ.Null("")