diff options
author | Ilya Etingof <etingof@gmail.com> | 2019-02-12 23:58:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-12 23:58:57 +0100 |
commit | 7a8838eeaf2a94a4ee8d309f2091a4fde13e5afc (patch) | |
tree | f6ac400c4897b2076d4e2759e5230e67100357db /pysnmp/hlapi | |
parent | 2a3fe3b5e08c91ab8d77569b02b36da63909f619 (diff) | |
download | pysnmp-git-7a8838eeaf2a94a4ee8d309f2091a4fde13e5afc.tar.gz |
PEP8 optimize imports (#242)
To make them PEP8-compliant
Diffstat (limited to 'pysnmp/hlapi')
26 files changed, 57 insertions, 50 deletions
diff --git a/pysnmp/hlapi/transport.py b/pysnmp/hlapi/transport.py index 61c01dd1..20471633 100644 --- a/pysnmp/hlapi/transport.py +++ b/pysnmp/hlapi/transport.py @@ -5,8 +5,9 @@ # License: http://snmplabs.com/pysnmp/license.html # from pyasn1.compat.octets import null -from pysnmp.carrier.base import AbstractTransport + from pysnmp import error +from pysnmp.carrier.base import AbstractTransport __all__ = [] diff --git a/pysnmp/hlapi/v1arch/__init__.py b/pysnmp/hlapi/v1arch/__init__.py index feec6bb1..66a1951b 100644 --- a/pysnmp/hlapi/v1arch/__init__.py +++ b/pysnmp/hlapi/v1arch/__init__.py @@ -4,11 +4,13 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.proto.rfc1902 import * -from pysnmp.proto.rfc1905 import NoSuchInstance, NoSuchObject, EndOfMibView -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.v1arch.auth import * from pysnmp.hlapi.v1arch.asyncore.dispatch import * +from pysnmp.proto.rfc1902 import * +from pysnmp.proto.rfc1905 import EndOfMibView +from pysnmp.proto.rfc1905 import NoSuchObject +from pysnmp.proto.rfc1905 import NoSuchInstance +from pysnmp.smi.rfc1902 import * # default is synchronous asyncore-based API from pysnmp.hlapi.v1arch.asyncore.sync import * diff --git a/pysnmp/hlapi/v1arch/asyncore/__init__.py b/pysnmp/hlapi/v1arch/asyncore/__init__.py index bd03fae5..86b9e539 100644 --- a/pysnmp/hlapi/v1arch/asyncore/__init__.py +++ b/pysnmp/hlapi/v1arch/asyncore/__init__.py @@ -4,10 +4,10 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.proto.rfc1902 import * -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.v1arch.auth import * from pysnmp.hlapi.v1arch.asyncore.transport import * from pysnmp.hlapi.v1arch.asyncore.cmdgen import * from pysnmp.hlapi.v1arch.asyncore.ntforg import * from pysnmp.hlapi.v1arch.asyncore.dispatch import * +from pysnmp.proto.rfc1902 import * +from pysnmp.smi.rfc1902 import * diff --git a/pysnmp/hlapi/v1arch/asyncore/cmdgen.py b/pysnmp/hlapi/v1arch/asyncore/cmdgen.py index 722f37df..e7ddadb2 100644 --- a/pysnmp/hlapi/v1arch/asyncore/cmdgen.py +++ b/pysnmp/hlapi/v1arch/asyncore/cmdgen.py @@ -5,9 +5,9 @@ # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.hlapi.varbinds import * from pysnmp.hlapi.v1arch.auth import * from pysnmp.hlapi.v1arch.asyncore import * +from pysnmp.hlapi.varbinds import * from pysnmp.smi.rfc1902 import * from pysnmp.proto import api from pysnmp import error diff --git a/pysnmp/hlapi/v1arch/asyncore/ntforg.py b/pysnmp/hlapi/v1arch/asyncore/ntforg.py index 80caeac5..12917eb0 100644 --- a/pysnmp/hlapi/v1arch/asyncore/ntforg.py +++ b/pysnmp/hlapi/v1arch/asyncore/ntforg.py @@ -4,9 +4,9 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.hlapi.varbinds import * from pysnmp.hlapi.v1arch.auth import * from pysnmp.hlapi.v1arch.asyncore import * +from pysnmp.hlapi.varbinds import * from pysnmp.smi.rfc1902 import * from pysnmp.proto import api from pysnmp.proto.proxy import rfc2576 diff --git a/pysnmp/hlapi/v1arch/asyncore/sync/cmdgen.py b/pysnmp/hlapi/v1arch/asyncore/sync/cmdgen.py index 4ca7c66c..d82f4d92 100644 --- a/pysnmp/hlapi/v1arch/asyncore/sync/cmdgen.py +++ b/pysnmp/hlapi/v1arch/asyncore/sync/cmdgen.py @@ -4,11 +4,11 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # +from pyasn1.type.univ import Null + from pysnmp.hlapi.v1arch.asyncore import cmdgen from pysnmp.hlapi.varbinds import * from pysnmp.proto.rfc1905 import endOfMibView -from pysnmp.proto import errind -from pyasn1.type.univ import Null __all__ = ['getCmd', 'nextCmd', 'setCmd', 'bulkCmd'] diff --git a/pysnmp/hlapi/v1arch/asyncore/sync/ntforg.py b/pysnmp/hlapi/v1arch/asyncore/sync/ntforg.py index d3e3ee03..81de276c 100644 --- a/pysnmp/hlapi/v1arch/asyncore/sync/ntforg.py +++ b/pysnmp/hlapi/v1arch/asyncore/sync/ntforg.py @@ -6,8 +6,6 @@ # from pysnmp.hlapi.v1arch.asyncore import ntforg from pysnmp.hlapi.varbinds import * -from pysnmp.proto import errind -from pyasn1.type.univ import Null __all__ = ['sendNotification'] diff --git a/pysnmp/hlapi/v1arch/asyncore/transport.py b/pysnmp/hlapi/v1arch/asyncore/transport.py index 452550a4..507424fe 100644 --- a/pysnmp/hlapi/v1arch/asyncore/transport.py +++ b/pysnmp/hlapi/v1arch/asyncore/transport.py @@ -8,7 +8,8 @@ import socket import sys from pysnmp import error -from pysnmp.carrier.asyncore.dgram import udp, udp6 +from pysnmp.carrier.asyncore.dgram import udp +from pysnmp.carrier.asyncore.dgram import udp6 from pysnmp.hlapi.transport import AbstractTransportTarget __all__ = ['Udp6TransportTarget', 'UdpTransportTarget'] diff --git a/pysnmp/hlapi/v1arch/dispatch.py b/pysnmp/hlapi/v1arch/dispatch.py index 56300d1b..606e0e19 100644 --- a/pysnmp/hlapi/v1arch/dispatch.py +++ b/pysnmp/hlapi/v1arch/dispatch.py @@ -6,12 +6,12 @@ # from time import time -from pysnmp.proto.api import verdec +from pyasn1.codec.ber import encoder, decoder + +from pysnmp import debug from pysnmp.proto import api from pysnmp.proto import error -from pysnmp import debug - -from pyasn1.codec.ber import encoder, decoder +from pysnmp.proto.api import verdec __all__ = [] diff --git a/pysnmp/hlapi/v3arch/__init__.py b/pysnmp/hlapi/v3arch/__init__.py index 82c88bba..565df668 100644 --- a/pysnmp/hlapi/v3arch/__init__.py +++ b/pysnmp/hlapi/v3arch/__init__.py @@ -4,11 +4,13 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.proto.rfc1902 import * -from pysnmp.proto.rfc1905 import NoSuchInstance, NoSuchObject, EndOfMibView -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.v3arch import auth from pysnmp.hlapi.v3arch.context import * +from pysnmp.proto.rfc1902 import * +from pysnmp.proto.rfc1905 import EndOfMibView +from pysnmp.proto.rfc1905 import NoSuchInstance +from pysnmp.proto.rfc1905 import NoSuchObject +from pysnmp.smi.rfc1902 import * from pysnmp.entity.engine import * # default is synchronous asyncore-based API diff --git a/pysnmp/hlapi/v3arch/asyncio/__init__.py b/pysnmp/hlapi/v3arch/asyncio/__init__.py index 53a9e999..b2cf1cbe 100644 --- a/pysnmp/hlapi/v3arch/asyncio/__init__.py +++ b/pysnmp/hlapi/v3arch/asyncio/__init__.py @@ -4,11 +4,11 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.proto.rfc1902 import * -from pysnmp.smi.rfc1902 import * from pysnmp.entity.engine import * from pysnmp.hlapi.v3arch.auth import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.asyncio.transport import * from pysnmp.hlapi.v3arch.asyncio.cmdgen import * from pysnmp.hlapi.v3arch.asyncio.ntforg import * +from pysnmp.proto.rfc1902 import * +from pysnmp.smi.rfc1902 import * diff --git a/pysnmp/hlapi/v3arch/asyncio/cmdgen.py b/pysnmp/hlapi/v3arch/asyncio/cmdgen.py index 8d978573..7faf9329 100644 --- a/pysnmp/hlapi/v3arch/asyncio/cmdgen.py +++ b/pysnmp/hlapi/v3arch/asyncio/cmdgen.py @@ -31,7 +31,6 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGE. # -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.v3arch.auth import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.lcd import * @@ -39,6 +38,7 @@ from pysnmp.hlapi.varbinds import * from pysnmp.hlapi.v3arch.asyncio.transport import * from pysnmp.entity.rfc3413 import cmdgen from pysnmp.proto.api import v2c +from pysnmp.smi.rfc1902 import * try: import asyncio diff --git a/pysnmp/hlapi/v3arch/asyncio/ntforg.py b/pysnmp/hlapi/v3arch/asyncio/ntforg.py index 0b974538..4851f443 100644 --- a/pysnmp/hlapi/v3arch/asyncio/ntforg.py +++ b/pysnmp/hlapi/v3arch/asyncio/ntforg.py @@ -8,16 +8,17 @@ # Authors: Matt Hooks <me@matthooks.com> # Zachary Lorusso <zlorusso@gmail.com> # -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.v3arch.auth import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.lcd import * from pysnmp.hlapi.varbinds import * from pysnmp.hlapi.v3arch.asyncio.transport import * from pysnmp.entity.rfc3413 import ntforg +from pysnmp.smi.rfc1902 import * try: import asyncio + except ImportError: import trollius as asyncio diff --git a/pysnmp/hlapi/v3arch/asyncio/transport.py b/pysnmp/hlapi/v3arch/asyncio/transport.py index 581ee549..9079c1c8 100644 --- a/pysnmp/hlapi/v3arch/asyncio/transport.py +++ b/pysnmp/hlapi/v3arch/asyncio/transport.py @@ -7,7 +7,8 @@ import socket import sys -from pysnmp.carrier.asyncio.dgram import udp, udp6 +from pysnmp.carrier.asyncio.dgram import udp +from pysnmp.carrier.asyncio.dgram import udp6 from pysnmp.error import PySnmpError from pysnmp.hlapi.transport import AbstractTransportTarget diff --git a/pysnmp/hlapi/v3arch/asyncore/__init__.py b/pysnmp/hlapi/v3arch/asyncore/__init__.py index 99c38f98..00ddac12 100644 --- a/pysnmp/hlapi/v3arch/asyncore/__init__.py +++ b/pysnmp/hlapi/v3arch/asyncore/__init__.py @@ -4,11 +4,11 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.proto.rfc1902 import * -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.v3arch.auth import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.asyncore.transport import * from pysnmp.hlapi.v3arch.asyncore.cmdgen import * from pysnmp.hlapi.v3arch.asyncore.ntforg import * from pysnmp.entity.engine import * +from pysnmp.proto.rfc1902 import * +from pysnmp.smi.rfc1902 import * diff --git a/pysnmp/hlapi/v3arch/asyncore/cmdgen.py b/pysnmp/hlapi/v3arch/asyncore/cmdgen.py index 53b4cd1b..ad31be35 100644 --- a/pysnmp/hlapi/v3arch/asyncore/cmdgen.py +++ b/pysnmp/hlapi/v3arch/asyncore/cmdgen.py @@ -4,14 +4,14 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.entity.rfc3413 import cmdgen -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.varbinds import * from pysnmp.hlapi.v3arch.auth import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.lcd import * from pysnmp.hlapi.v3arch.asyncore.transport import * +from pysnmp.entity.rfc3413 import cmdgen from pysnmp.proto.api import v2c +from pysnmp.smi.rfc1902 import * __all__ = ['getCmd', 'nextCmd', 'setCmd', 'bulkCmd', 'isEndOfMib'] diff --git a/pysnmp/hlapi/v3arch/asyncore/ntforg.py b/pysnmp/hlapi/v3arch/asyncore/ntforg.py index e69eccbf..779c4246 100644 --- a/pysnmp/hlapi/v3arch/asyncore/ntforg.py +++ b/pysnmp/hlapi/v3arch/asyncore/ntforg.py @@ -4,13 +4,13 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.smi.rfc1902 import * -from pysnmp.entity.rfc3413 import ntforg from pysnmp.hlapi.v3arch.auth import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.lcd import * -from pysnmp.hlapi.varbinds import * from pysnmp.hlapi.v3arch.asyncore.transport import * +from pysnmp.hlapi.varbinds import * +from pysnmp.entity.rfc3413 import ntforg +from pysnmp.smi.rfc1902 import * __all__ = ['sendNotification'] diff --git a/pysnmp/hlapi/v3arch/asyncore/sync/__init__.py b/pysnmp/hlapi/v3arch/asyncore/sync/__init__.py index 9ff7d84d..50eddd19 100644 --- a/pysnmp/hlapi/v3arch/asyncore/sync/__init__.py +++ b/pysnmp/hlapi/v3arch/asyncore/sync/__init__.py @@ -4,12 +4,11 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.proto.rfc1902 import * -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.v3arch.auth import * +from pysnmp.hlapi.v3arch.asyncore.sync.cmdgen import * +from pysnmp.hlapi.v3arch.asyncore.sync.ntforg import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.asyncore.transport import * +from pysnmp.proto.rfc1902 import * from pysnmp.entity.engine import * - -from pysnmp.hlapi.v3arch.asyncore.sync.cmdgen import * -from pysnmp.hlapi.v3arch.asyncore.sync.ntforg import * +from pysnmp.smi.rfc1902 import * diff --git a/pysnmp/hlapi/v3arch/asyncore/transport.py b/pysnmp/hlapi/v3arch/asyncore/transport.py index 61d32aaa..2cae2d7d 100644 --- a/pysnmp/hlapi/v3arch/asyncore/transport.py +++ b/pysnmp/hlapi/v3arch/asyncore/transport.py @@ -5,7 +5,6 @@ # License: http://snmplabs.com/pysnmp/license.html # import socket -import sys from pysnmp import error from pysnmp.carrier.asyncore.dgram import udp, udp6 diff --git a/pysnmp/hlapi/v3arch/auth.py b/pysnmp/hlapi/v3arch/auth.py index 47152c88..7c232221 100644 --- a/pysnmp/hlapi/v3arch/auth.py +++ b/pysnmp/hlapi/v3arch/auth.py @@ -4,10 +4,11 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.entity import config -from pysnmp import error from pyasn1.compat.octets import null +from pysnmp import error +from pysnmp.entity import config + __all__ = [ 'CommunityData', 'UsmUserData', 'USM_AUTH_NONE', 'USM_AUTH_HMAC96_MD5', diff --git a/pysnmp/hlapi/v3arch/lcd.py b/pysnmp/hlapi/v3arch/lcd.py index aefee634..b3397b0c 100644 --- a/pysnmp/hlapi/v3arch/lcd.py +++ b/pysnmp/hlapi/v3arch/lcd.py @@ -4,12 +4,13 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # +from pyasn1.compat.octets import null + +from pysnmp import error +from pysnmp import nextid from pysnmp.entity import config -from pysnmp import nextid, error from pysnmp.hlapi.v3arch.auth import * -from pyasn1.compat.octets import null - __all__ = ['CommandGeneratorLcdConfigurator', 'NotificationOriginatorLcdConfigurator'] diff --git a/pysnmp/hlapi/v3arch/twisted/__init__.py b/pysnmp/hlapi/v3arch/twisted/__init__.py index f141bf55..a0e14e5d 100644 --- a/pysnmp/hlapi/v3arch/twisted/__init__.py +++ b/pysnmp/hlapi/v3arch/twisted/__init__.py @@ -1,8 +1,8 @@ -from pysnmp.proto.rfc1902 import * -from pysnmp.smi.rfc1902 import * -from pysnmp.entity.engine import * from pysnmp.hlapi.v3arch.auth import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.twisted.transport import * from pysnmp.hlapi.v3arch.twisted.cmdgen import * from pysnmp.hlapi.v3arch.twisted.ntforg import * +from pysnmp.entity.engine import * +from pysnmp.proto.rfc1902 import * +from pysnmp.smi.rfc1902 import * diff --git a/pysnmp/hlapi/v3arch/twisted/cmdgen.py b/pysnmp/hlapi/v3arch/twisted/cmdgen.py index 028af30a..aea8174d 100644 --- a/pysnmp/hlapi/v3arch/twisted/cmdgen.py +++ b/pysnmp/hlapi/v3arch/twisted/cmdgen.py @@ -4,7 +4,6 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.v3arch.auth import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.lcd import * @@ -13,6 +12,8 @@ from pysnmp.hlapi.v3arch.twisted.transport import * from pysnmp.entity.rfc3413 import cmdgen from pysnmp.proto import errind from pysnmp.proto.api import v2c +from pysnmp.smi.rfc1902 import * + from twisted.internet.defer import Deferred from twisted.python.failure import Failure diff --git a/pysnmp/hlapi/v3arch/twisted/ntforg.py b/pysnmp/hlapi/v3arch/twisted/ntforg.py index 1888d543..681579bb 100644 --- a/pysnmp/hlapi/v3arch/twisted/ntforg.py +++ b/pysnmp/hlapi/v3arch/twisted/ntforg.py @@ -4,13 +4,14 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.smi.rfc1902 import * from pysnmp.hlapi.v3arch.auth import * from pysnmp.hlapi.v3arch.context import * from pysnmp.hlapi.v3arch.lcd import * from pysnmp.hlapi.varbinds import * from pysnmp.hlapi.v3arch.twisted.transport import * from pysnmp.entity.rfc3413 import ntforg +from pysnmp.smi.rfc1902 import * + from twisted.internet import reactor from twisted.internet.defer import Deferred from twisted.python.failure import Failure diff --git a/pysnmp/hlapi/v3arch/twisted/transport.py b/pysnmp/hlapi/v3arch/twisted/transport.py index db4a7b79..11119fc4 100644 --- a/pysnmp/hlapi/v3arch/twisted/transport.py +++ b/pysnmp/hlapi/v3arch/twisted/transport.py @@ -5,7 +5,6 @@ # License: http://snmplabs.com/pysnmp/license.html # import socket -import sys from pysnmp.carrier.twisted.dgram import udp from pysnmp.error import PySnmpError diff --git a/pysnmp/hlapi/varbinds.py b/pysnmp/hlapi/varbinds.py index 7414754f..d3742a75 100644 --- a/pysnmp/hlapi/varbinds.py +++ b/pysnmp/hlapi/varbinds.py @@ -4,9 +4,9 @@ # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com> # License: http://snmplabs.com/pysnmp/license.html # -from pysnmp.smi.rfc1902 import * from pysnmp.smi import builder from pysnmp.smi import view +from pysnmp.smi.rfc1902 import * __all__ = ['CommandGeneratorVarBinds', 'NotificationOriginatorVarBinds'] |