11 files changed, 45 insertions, 37 deletions
diff --git a/pysnmp/smi/builder.py b/pysnmp/smi/builder.py
index dedf95a2..9d75732b 100644
--- a/pysnmp/smi/builder.py
+++ b/pysnmp/smi/builder.py
@@ -4,11 +4,11 @@
 # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com>
 # License: http://snmplabs.com/pysnmp/license.html
 #
-import os
-import sys
 import imp
-import struct
 import marshal
+import os
+import struct
+import sys
 import time
 import traceback
 
@@ -18,10 +18,6 @@ try:
 except ImportError:
     ENOENT = -1
 
-from pysnmp import __version__ as pysnmp_version
-from pysnmp.smi import error
-from pysnmp import debug
-
 if sys.version_info[0] <= 2:
     import types
 
@@ -29,6 +25,10 @@ if sys.version_info[0] <= 2:
 else:
     classTypes = (type,)
 
+from pysnmp import __version__ as pysnmp_version
+from pysnmp.smi import error
+from pysnmp import debug
+
 
 class __AbstractMibSource(object):
     def __init__(self, srcName):
diff --git a/pysnmp/smi/error.py b/pysnmp/smi/error.py
index df4682fc..87909b1e 100644
--- a/pysnmp/smi/error.py
+++ b/pysnmp/smi/error.py
@@ -5,6 +5,7 @@
 # License: http://snmplabs.com/pysnmp/license.html
 #
 from pyasn1.error import PyAsn1Error
+
 from pysnmp.error import PySnmpError
 
 
diff --git a/pysnmp/smi/instrum.py b/pysnmp/smi/instrum.py
index 05c5c30b..aec25adc 100644
--- a/pysnmp/smi/instrum.py
+++ b/pysnmp/smi/instrum.py
@@ -4,13 +4,8 @@
 # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com>
 # License: http://snmplabs.com/pysnmp/license.html
 #
-import sys
-import traceback
-import functools
-from pysnmp import nextid
-from pysnmp.proto import rfc1905
-from pysnmp.smi import error
 from pysnmp import debug
+from pysnmp.smi import error
 
 __all__ = ['AbstractMibInstrumController', 'MibInstrumController']
 
diff --git a/pysnmp/smi/mibs/ASN1.py b/pysnmp/smi/mibs/ASN1.py
index 4a393d3b..f7ba6d56 100644
--- a/pysnmp/smi/mibs/ASN1.py
+++ b/pysnmp/smi/mibs/ASN1.py
@@ -5,6 +5,7 @@
 # License: http://snmplabs.com/pysnmp/license.html
 #
 from pyasn1.type import univ
+
 from pysnmp.proto import rfc1902
 
 mibBuilder.exportSymbols(
diff --git a/pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py b/pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py
index e7ff01f3..704e4ef8 100644
--- a/pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py
+++ b/pysnmp/smi/mibs/SNMP-FRAMEWORK-MIB.py
@@ -10,11 +10,8 @@
 # On host grommit.local platform Darwin version 16.4.0 by user ilya
 # Using Python version 3.4.2 (v3.4.2:ab2c023a9432, Oct  5 2014, 20:42:22)
 #
+import os
 import time
-try:
-    import os
-except ImportError:
-    pass
 
 OctetString, ObjectIdentifier, Integer = mibBuilder.importSymbols("ASN1", "OctetString", "ObjectIdentifier", "Integer")
 NamedValues, = mibBuilder.importSymbols("ASN1-ENUMERATION", "NamedValues")
diff --git a/pysnmp/smi/mibs/SNMPv2-SMI.py b/pysnmp/smi/mibs/SNMPv2-SMI.py
index 68b2922a..ae48cc3c 100644
--- a/pysnmp/smi/mibs/SNMPv2-SMI.py
+++ b/pysnmp/smi/mibs/SNMPv2-SMI.py
@@ -6,12 +6,16 @@
 #
 import sys
 import traceback
-from pysnmp.smi.indices import OidOrderedDict
-from pysnmp.smi import exval, error
-from pysnmp.proto import rfc1902
-from pysnmp import cache, debug
-from pyasn1.type import univ
+
 from pyasn1.error import PyAsn1Error
+from pyasn1.type import univ
+
+from pysnmp import cache
+from pysnmp import debug
+from pysnmp.proto import rfc1902
+from pysnmp.smi import error
+from pysnmp.smi import exval
+from pysnmp.smi.indices import OidOrderedDict
 
 Integer, ObjectIdentifier = mibBuilder.importSymbols(
     "ASN1", "Integer", "ObjectIdentifier"
diff --git a/pysnmp/smi/mibs/SNMPv2-TC.py b/pysnmp/smi/mibs/SNMPv2-TC.py
index f234a2f3..600bb8f9 100644
--- a/pysnmp/smi/mibs/SNMPv2-TC.py
+++ b/pysnmp/smi/mibs/SNMPv2-TC.py
@@ -4,15 +4,16 @@
 # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com>
 # License: http://snmplabs.com/pysnmp/license.html
 #
-import sys
 import inspect
 import string
-from pysnmp.smi.error import *
-from pysnmp import debug
-from pyasn1.type import univ
+
 from pyasn1.compat import octets
+from pyasn1.type import univ
 from pyasn1.type.base import Asn1Item
 
+from pysnmp import debug
+from pysnmp.smi.error import *
+
 OctetString, Integer, ObjectIdentifier = mibBuilder.importSymbols('ASN1', 'OctetString', 'Integer', 'ObjectIdentifier')
 NamedValues, = mibBuilder.importSymbols("ASN1-ENUMERATION", "NamedValues")
 ConstraintsIntersection, ConstraintsUnion, SingleValueConstraint, ValueRangeConstraint, ValueSizeConstraint = mibBuilder.importSymbols("ASN1-REFINEMENT", "ConstraintsIntersection", "ConstraintsUnion", "SingleValueConstraint", "ValueRangeConstraint", "ValueSizeConstraint")
diff --git a/pysnmp/smi/mibs/SNMPv2-TM.py b/pysnmp/smi/mibs/SNMPv2-TM.py
index 67c32137..558999ac 100644
--- a/pysnmp/smi/mibs/SNMPv2-TM.py
+++ b/pysnmp/smi/mibs/SNMPv2-TM.py
@@ -12,13 +12,15 @@
 #
 try:
     from socket import inet_ntop, inet_pton, AF_INET
+
 except ImportError:
     from socket import inet_ntoa, inet_aton, AF_INET
 
     inet_ntop = lambda x, y: inet_ntoa(y)
     inet_pton = lambda x, y: inet_aton(y)
 
-from pyasn1.compat.octets import int2oct, oct2int
+from pyasn1.compat.octets import int2oct
+from pyasn1.compat.octets import oct2int
 
 OctetString, = mibBuilder.importSymbols('ASN1', 'OctetString')
 ConstraintsIntersection, ConstraintsUnion, SingleValueConstraint, ValueRangeConstraint, ValueSizeConstraint = mibBuilder.importSymbols("ASN1-REFINEMENT", "ConstraintsIntersection", "ConstraintsUnion", "SingleValueConstraint", "ValueRangeConstraint", "ValueSizeConstraint")
diff --git a/pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py b/pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py
index 213bb89c..e1eaf546 100644
--- a/pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py
+++ b/pysnmp/smi/mibs/TRANSPORT-ADDRESS-MIB.py
@@ -11,16 +11,19 @@
 # Using Python version 3.4.2 (v3.4.2:ab2c023a9432, Oct  5 2014, 20:42:22)
 #
 
-from pyasn1.compat.octets import int2oct, oct2int
-from pysnmp import error
-from pysnmp.carrier import sockfix
 import socket
 
+from pyasn1.compat.octets import int2oct
+from pyasn1.compat.octets import oct2int
+
+from pysnmp import error
+
 has_ipv6 = socket.has_ipv6
 
 if hasattr(socket, 'inet_ntop') and hasattr(socket, 'inet_pton'):
     inet_ntop = socket.inet_ntop
     inet_pton = socket.inet_pton
+
 else:
     import sys
 
@@ -30,6 +33,7 @@ else:
         inet_ntop = lambda x, y: inet_ntoa(y)
         inet_pton = lambda x, y: inet_aton(y)
         has_ipv6 = False
+
     elif has_ipv6:
         import struct  # The case of old Python at old Windows
 
diff --git a/pysnmp/smi/rfc1902.py b/pysnmp/smi/rfc1902.py
index 35c9f628..ee32470d 100644
--- a/pysnmp/smi/rfc1902.py
+++ b/pysnmp/smi/rfc1902.py
@@ -4,15 +4,16 @@
 # Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com>
 # License: http://snmplabs.com/pysnmp/license.html
 #
-import sys
-from pysnmp.proto import rfc1902, rfc1905
+from pyasn1.error import PyAsn1Error
+from pyasn1.type.base import AbstractSimpleAsn1Item
+
+from pysnmp import debug
+from pysnmp.proto import rfc1902
+from pysnmp.proto import rfc1905
 from pysnmp.proto.api import v2c
 from pysnmp.smi.builder import ZipMibSource
 from pysnmp.smi.compiler import addMibCompiler
 from pysnmp.smi.error import SmiError
-from pyasn1.type.base import AbstractSimpleAsn1Item
-from pyasn1.error import PyAsn1Error
-from pysnmp import debug
 
 __all__ = ['ObjectIdentity', 'ObjectType', 'NotificationType']
 
diff --git a/pysnmp/smi/view.py b/pysnmp/smi/view.py
index 46e74d8a..e9fd405e 100644
--- a/pysnmp/smi/view.py
+++ b/pysnmp/smi/view.py
@@ -5,9 +5,11 @@
 # License: http://snmplabs.com/pysnmp/license.html
 #
 import sys
-from pysnmp.smi.indices import OrderedDict, OidOrderedDict
-from pysnmp.smi import error
+
 from pysnmp import debug
+from pysnmp.smi import error
+from pysnmp.smi.indices import OidOrderedDict
+from pysnmp.smi.indices import OrderedDict
 
 __all__ = ['MibViewController']