From 7a8838eeaf2a94a4ee8d309f2091a4fde13e5afc Mon Sep 17 00:00:00 2001 From: Ilya Etingof Date: Tue, 12 Feb 2019 23:58:57 +0100 Subject: PEP8 optimize imports (#242) To make them PEP8-compliant --- pysnmp/entity/config.py | 18 ++++++++++++------ pysnmp/entity/engine.py | 20 ++++++++++++-------- pysnmp/entity/rfc3413/cmdgen.py | 12 +++++++----- pysnmp/entity/rfc3413/cmdrsp.py | 11 +++++++---- pysnmp/entity/rfc3413/config.py | 3 ++- pysnmp/entity/rfc3413/context.py | 5 +++-- pysnmp/entity/rfc3413/ntforg.py | 12 +++++------- pysnmp/entity/rfc3413/ntfrcv.py | 10 ++++++---- 8 files changed, 54 insertions(+), 37 deletions(-) (limited to 'pysnmp/entity') diff --git a/pysnmp/entity/config.py b/pysnmp/entity/config.py index e89a102a..0ae87c0b 100644 --- a/pysnmp/entity/config.py +++ b/pysnmp/entity/config.py @@ -5,14 +5,20 @@ # License: http://snmplabs.com/pysnmp/license.html # from pyasn1.compat.octets import null -from pysnmp.carrier.asyncore.dgram import udp, udp6 -from pysnmp.proto.secmod.rfc3414.auth import hmacmd5, hmacsha, noauth -from pysnmp.proto.secmod.rfc3414.priv import des, nopriv + +from pysnmp import error +from pysnmp.carrier.asyncore.dgram import udp +from pysnmp.carrier.asyncore.dgram import udp6 +from pysnmp.proto.secmod.rfc3414.auth import hmacmd5 +from pysnmp.proto.secmod.rfc3414.auth import hmacsha +from pysnmp.proto.secmod.rfc3414.auth import noauth +from pysnmp.proto.secmod.rfc3414.priv import des +from pysnmp.proto.secmod.rfc3414.priv import 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 rfc1905 -from pysnmp import error +from pysnmp.proto.secmod.eso.priv import aes192 +from pysnmp.proto.secmod.eso.priv import aes256 +from pysnmp.proto.secmod.eso.priv import des3 # A shortcut to popular constants diff --git a/pysnmp/entity/engine.py b/pysnmp/entity/engine.py index 8c4e363a..60b45b0c 100644 --- a/pysnmp/entity/engine.py +++ b/pysnmp/entity/engine.py @@ -6,18 +6,22 @@ # import os import shutil -import sys import tempfile + from pyasn1.compat.octets import str2octs -from pysnmp.proto.rfc3412 import MsgAndPduDispatcher -from pysnmp.proto.mpmod.rfc2576 import SnmpV1MessageProcessingModel, SnmpV2cMessageProcessingModel -from pysnmp.proto.mpmod.rfc3412 import SnmpV3MessageProcessingModel -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 +from pysnmp.entity import observer +from pysnmp.proto.acmod import rfc3415 +from pysnmp.proto.acmod import void +from pysnmp.proto.mpmod.rfc2576 import SnmpV1MessageProcessingModel +from pysnmp.proto.mpmod.rfc2576 import SnmpV2cMessageProcessingModel +from pysnmp.proto.mpmod.rfc3412 import SnmpV3MessageProcessingModel +from pysnmp.proto.rfc3412 import MsgAndPduDispatcher +from pysnmp.proto.secmod.rfc2576 import SnmpV1SecurityModel +from pysnmp.proto.secmod.rfc2576 import SnmpV2cSecurityModel +from pysnmp.proto.secmod.rfc3414 import SnmpUSMSecurityModel __all__ = ['SnmpEngine'] diff --git a/pysnmp/entity/rfc3413/cmdgen.py b/pysnmp/entity/rfc3413/cmdgen.py index 9ca9b50b..6f13c265 100644 --- a/pysnmp/entity/rfc3413/cmdgen.py +++ b/pysnmp/entity/rfc3413/cmdgen.py @@ -4,14 +4,16 @@ # Copyright (c) 2005-2019, Ilya Etingof # License: http://snmplabs.com/pysnmp/license.html # -import sys +from pyasn1.type import univ + +from pysnmp import debug +from pysnmp import error +from pysnmp import nextid from pysnmp.entity.rfc3413 import config -from pysnmp.proto import rfc1905, errind +from pysnmp.proto import errind 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) diff --git a/pysnmp/entity/rfc3413/cmdrsp.py b/pysnmp/entity/rfc3413/cmdrsp.py index 52951a4b..7910b86b 100644 --- a/pysnmp/entity/rfc3413/cmdrsp.py +++ b/pysnmp/entity/rfc3413/cmdrsp.py @@ -4,13 +4,16 @@ # Copyright (c) 2005-2019, Ilya Etingof # License: http://snmplabs.com/pysnmp/license.html # -import sys -from pysnmp.proto import rfc1902, rfc1905, rfc3411, errind, error +import pysnmp.smi.error +from pysnmp import debug +from pysnmp.proto import errind +from pysnmp.proto import error +from pysnmp.proto import rfc1902 +from pysnmp.proto import rfc1905 +from pysnmp.proto import rfc3411 from pysnmp.proto.api import v2c # backend is always SMIv2 compliant from pysnmp.proto.proxy import rfc2576 -import pysnmp.smi.error from pysnmp.smi import exval -from pysnmp import debug # 3.2 diff --git a/pysnmp/entity/rfc3413/config.py b/pysnmp/entity/rfc3413/config.py index 7689824b..c58c74ba 100644 --- a/pysnmp/entity/rfc3413/config.py +++ b/pysnmp/entity/rfc3413/config.py @@ -4,8 +4,9 @@ # Copyright (c) 2005-2019, Ilya Etingof # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.smi.error import SmiError, NoSuchInstanceError from pysnmp.entity import config +from pysnmp.smi.error import NoSuchInstanceError +from pysnmp.smi.error import SmiError def getTargetAddr(snmpEngine, snmpTargetAddrName): diff --git a/pysnmp/entity/rfc3413/context.py b/pysnmp/entity/rfc3413/context.py index 7d3c3262..9a99f284 100644 --- a/pysnmp/entity/rfc3413/context.py +++ b/pysnmp/entity/rfc3413/context.py @@ -4,10 +4,11 @@ # Copyright (c) 2005-2019, Ilya Etingof # License: http://snmplabs.com/pysnmp/license.html # -from pyasn1.type import univ from pyasn1.compat.octets import null -from pysnmp import error +from pyasn1.type import univ + from pysnmp import debug +from pysnmp import error class SnmpContext(object): diff --git a/pysnmp/entity/rfc3413/ntforg.py b/pysnmp/entity/rfc3413/ntforg.py index 0c686635..be0d0dbf 100644 --- a/pysnmp/entity/rfc3413/ntforg.py +++ b/pysnmp/entity/rfc3413/ntforg.py @@ -4,16 +4,14 @@ # Copyright (c) 2005-2019, Ilya Etingof # License: http://snmplabs.com/pysnmp/license.html # -import sys -from pyasn1.compat.octets import null +from pysnmp import debug +from pysnmp import nextid from pysnmp.entity.rfc3413 import config -from pysnmp.proto.proxy import rfc2576 +from pysnmp.proto import errind +from pysnmp.proto import error from pysnmp.proto import rfc3411 from pysnmp.proto.api import v2c -from pysnmp.proto import errind, error -from pysnmp.smi import view, rfc1902 -from pysnmp import nextid -from pysnmp import debug +from pysnmp.proto.proxy import rfc2576 getNextHandle = nextid.Integer(0x7fffffff) diff --git a/pysnmp/entity/rfc3413/ntfrcv.py b/pysnmp/entity/rfc3413/ntfrcv.py index c286ec54..a4754be2 100644 --- a/pysnmp/entity/rfc3413/ntfrcv.py +++ b/pysnmp/entity/rfc3413/ntfrcv.py @@ -4,12 +4,14 @@ # Copyright (c) 2005-2019, Ilya Etingof # License: http://snmplabs.com/pysnmp/license.html # -import sys from pyasn1.compat.octets import null -from pysnmp.proto import rfc3411, error -from pysnmp.proto.api import v1, v2c # backend is always SMIv2 compliant -from pysnmp.proto.proxy import rfc2576 + from pysnmp import debug +from pysnmp.proto import error +from pysnmp.proto import rfc3411 +from pysnmp.proto.api import v1 +from pysnmp.proto.api import v2c # backend is always SMIv2 compliant +from pysnmp.proto.proxy import rfc2576 # 3.4 -- cgit v1.2.1