16 files changed, 37 insertions, 32 deletions
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