imports pep8'ed and optimized

22 files changed, 102 insertions, 25 deletions

diff --git a/pyasn1_modules/rfc1155.py b/pyasn1_modules/rfc1155.py
index 4980a38..69c160e 100644
--- a/pyasn1_modules/rfc1155.py
+++ b/pyasn1_modules/rfc1155.py
@@ -12,7 +12,10 @@
 # Sample captures from:
 # http://wiki.wireshark.org/SampleCaptures/
 #
-from pyasn1.type import univ, namedtype, tag, constraint
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import tag
+from pyasn1.type import univ
 
 
 class ObjectName(univ.ObjectIdentifier):
diff --git a/pyasn1_modules/rfc1157.py b/pyasn1_modules/rfc1157.py
index 1ad1d27..9e6527b 100644
--- a/pyasn1_modules/rfc1157.py
+++ b/pyasn1_modules/rfc1157.py
@@ -12,7 +12,11 @@
 # Sample captures from:
 # http://wiki.wireshark.org/SampleCaptures/
 #
-from pyasn1.type import univ, namedtype, namedval, tag
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import univ
+
 from pyasn1_modules import rfc1155
 
 
diff --git a/pyasn1_modules/rfc1901.py b/pyasn1_modules/rfc1901.py
index eadf9aa..6e8d1f1 100644
--- a/pyasn1_modules/rfc1901.py
+++ b/pyasn1_modules/rfc1901.py
@@ -9,7 +9,9 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc1901.txt
 #
-from pyasn1.type import univ, namedtype, namedval
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import univ
 
 
 class Message(univ.Sequence):
diff --git a/pyasn1_modules/rfc1902.py b/pyasn1_modules/rfc1902.py
index 5e9307e..7e815d2 100644
--- a/pyasn1_modules/rfc1902.py
+++ b/pyasn1_modules/rfc1902.py
@@ -9,7 +9,10 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc1902.txt
 #
-from pyasn1.type import univ, namedtype, tag, constraint
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import tag
+from pyasn1.type import univ
 
 
 class Integer(univ.Integer):
diff --git a/pyasn1_modules/rfc1905.py b/pyasn1_modules/rfc1905.py
index de5bb03..31e4203 100644
--- a/pyasn1_modules/rfc1905.py
+++ b/pyasn1_modules/rfc1905.py
@@ -9,7 +9,12 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc1905.txt
 #
-from pyasn1.type import univ, namedtype, namedval, tag, constraint
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import univ
+
 from pyasn1_modules import rfc1902
 
 max_bindings = rfc1902.Integer(2147483647)
diff --git a/pyasn1_modules/rfc2251.py b/pyasn1_modules/rfc2251.py
index 94ba589..a4c07a0 100644
--- a/pyasn1_modules/rfc2251.py
+++ b/pyasn1_modules/rfc2251.py
@@ -12,7 +12,11 @@
 # Sample captures from:
 # http://wiki.wireshark.org/SampleCaptures/
 #
-from pyasn1.type import tag, namedtype, namedval, univ, constraint
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import univ
 
 maxInt = univ.Integer(2147483647)
 
diff --git a/pyasn1_modules/rfc2437.py b/pyasn1_modules/rfc2437.py
index 678d92d..4e4113f 100644
--- a/pyasn1_modules/rfc2437.py
+++ b/pyasn1_modules/rfc2437.py
@@ -11,7 +11,10 @@
 #
 # Sample captures could be obtained with "openssl genrsa" command
 #
-from pyasn1.type import tag, namedtype, univ
+from pyasn1.type import namedtype
+from pyasn1.type import tag
+from pyasn1.type import univ
+
 from pyasn1_modules.rfc2459 import AlgorithmIdentifier
 
 pkcs_1 = univ.ObjectIdentifier('1.2.840.113549.1.1')
diff --git a/pyasn1_modules/rfc2459.py b/pyasn1_modules/rfc2459.py
index 6855482..1f78185 100644
--- a/pyasn1_modules/rfc2459.py
+++ b/pyasn1_modules/rfc2459.py
@@ -13,7 +13,14 @@
 # Sample captures from:
 # http://wiki.wireshark.org/SampleCaptures/
 #
-from pyasn1.type import tag, namedtype, namedval, opentype, univ, constraint, char, useful
+from pyasn1.type import char
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import opentype
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
 
 MAX = float('inf')
 
diff --git a/pyasn1_modules/rfc2511.py b/pyasn1_modules/rfc2511.py
index 4ae7db5..b42d1d9 100644
--- a/pyasn1_modules/rfc2511.py
+++ b/pyasn1_modules/rfc2511.py
@@ -11,8 +11,8 @@
 #
 # Sample captures could be obtained with OpenSSL
 #
-from pyasn1_modules.rfc2459 import *
 from pyasn1_modules import rfc2315
+from pyasn1_modules.rfc2459 import *
 
 MAX = float('inf')
 
diff --git a/pyasn1_modules/rfc2560.py b/pyasn1_modules/rfc2560.py
index 472099e..47ca4e1 100644
--- a/pyasn1_modules/rfc2560.py
+++ b/pyasn1_modules/rfc2560.py
@@ -21,7 +21,12 @@
 # * dates are left as strings in GeneralizedTime format -- datetime.datetime
 # would be nicer
 #
-from pyasn1.type import tag, namedtype, namedval, univ, useful
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
+
 from pyasn1_modules import rfc2459
 
 
diff --git a/pyasn1_modules/rfc3279.py b/pyasn1_modules/rfc3279.py
index f69ff08..65a554d 100644
--- a/pyasn1_modules/rfc3279.py
+++ b/pyasn1_modules/rfc3279.py
@@ -6,7 +6,9 @@
 #
 # Derived from RFC 3279
 #
-from pyasn1.type import univ, char, namedtype, namedval, tag, constraint, useful
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import univ
 
 
 def _OID(*components):
diff --git a/pyasn1_modules/rfc3280.py b/pyasn1_modules/rfc3280.py
index 3614e6c..f49dcfb 100644
--- a/pyasn1_modules/rfc3280.py
+++ b/pyasn1_modules/rfc3280.py
@@ -12,7 +12,13 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc3280.txt
 #
-from pyasn1.type import univ, char, namedtype, namedval, tag, constraint, useful
+from pyasn1.type import char
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
 
 MAX = float('inf')
 
diff --git a/pyasn1_modules/rfc3281.py b/pyasn1_modules/rfc3281.py
index 8aa99d3..9ecc2cd 100644
--- a/pyasn1_modules/rfc3281.py
+++ b/pyasn1_modules/rfc3281.py
@@ -11,12 +11,12 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc3281.txt
 #
-from pyasn1.type import univ
 from pyasn1.type import char
+from pyasn1.type import constraint
 from pyasn1.type import namedtype
 from pyasn1.type import namedval
 from pyasn1.type import tag
-from pyasn1.type import constraint
+from pyasn1.type import univ
 from pyasn1.type import useful
 
 from pyasn1_modules import rfc3280
diff --git a/pyasn1_modules/rfc3412.py b/pyasn1_modules/rfc3412.py
index b3f5a92..1492e62 100644
--- a/pyasn1_modules/rfc3412.py
+++ b/pyasn1_modules/rfc3412.py
@@ -9,7 +9,10 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc3412.txt
 #
-from pyasn1.type import univ, namedtype, constraint
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import univ
+
 from pyasn1_modules import rfc1905
 
 
diff --git a/pyasn1_modules/rfc3414.py b/pyasn1_modules/rfc3414.py
index aeb82aa..cac18cf 100644
--- a/pyasn1_modules/rfc3414.py
+++ b/pyasn1_modules/rfc3414.py
@@ -9,7 +9,9 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc3414.txt
 #
-from pyasn1.type import univ, namedtype, constraint
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import univ
 
 
 class UsmSecurityParameters(univ.Sequence):
diff --git a/pyasn1_modules/rfc3447.py b/pyasn1_modules/rfc3447.py
index 57c99fa..a2950aa 100644
--- a/pyasn1_modules/rfc3447.py
+++ b/pyasn1_modules/rfc3447.py
@@ -11,7 +11,9 @@
 #
 # Sample captures could be obtained with "openssl genrsa" command
 #
-from pyasn1.type import constraint, namedval
+from pyasn1.type import constraint
+from pyasn1.type import namedval
+
 from pyasn1_modules.rfc2437 import *
 
 
diff --git a/pyasn1_modules/rfc3852.py b/pyasn1_modules/rfc3852.py
index 872eb88..3b17fe5 100644
--- a/pyasn1_modules/rfc3852.py
+++ b/pyasn1_modules/rfc3852.py
@@ -11,7 +11,12 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc3852.txt
 #
-from pyasn1.type import univ, namedtype, namedval, tag, constraint, useful
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
 
 from pyasn1_modules import rfc3280
 from pyasn1_modules import rfc3281
diff --git a/pyasn1_modules/rfc4210.py b/pyasn1_modules/rfc4210.py
index d7e6db0..b93464f 100644
--- a/pyasn1_modules/rfc4210.py
+++ b/pyasn1_modules/rfc4210.py
@@ -8,8 +8,17 @@
 #
 # Based on Alex Railean's work
 #
-from pyasn1.type import tag, namedtype, namedval, univ, constraint, char, useful
-from pyasn1_modules import rfc2459, rfc2511, rfc2314
+from pyasn1.type import char
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
+
+from pyasn1_modules import rfc2314
+from pyasn1_modules import rfc2459
+from pyasn1_modules import rfc2511
 
 MAX = float('inf')
 
diff --git a/pyasn1_modules/rfc4211.py b/pyasn1_modules/rfc4211.py
index d20da78..9ff07f2 100644
--- a/pyasn1_modules/rfc4211.py
+++ b/pyasn1_modules/rfc4211.py
@@ -12,7 +12,12 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc4211.txt
 #
-from pyasn1.type import univ, char, namedtype, namedval, tag, constraint
+from pyasn1.type import char
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import univ
 
 from pyasn1_modules import rfc3280
 from pyasn1_modules import rfc3852
diff --git a/pyasn1_modules/rfc5208.py b/pyasn1_modules/rfc5208.py
index 6b6487d..7857d2f 100644
--- a/pyasn1_modules/rfc5208.py
+++ b/pyasn1_modules/rfc5208.py
@@ -11,8 +11,8 @@
 #
 # Sample captures could be obtained with "openssl pkcs8 -topk8" command
 #
-from pyasn1_modules.rfc2459 import *
 from pyasn1_modules import rfc2251
+from pyasn1_modules.rfc2459 import *
 
 
 class KeyEncryptionAlgorithms(AlgorithmIdentifier):
diff --git a/pyasn1_modules/rfc5280.py b/pyasn1_modules/rfc5280.py
index c750f28..2ecc627 100644
--- a/pyasn1_modules/rfc5280.py
+++ b/pyasn1_modules/rfc5280.py
@@ -12,17 +12,18 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc5280.txt
 #
-from pyasn1.type import univ
 from pyasn1.type import char
+from pyasn1.type import constraint
 from pyasn1.type import namedtype
 from pyasn1.type import namedval
 from pyasn1.type import opentype
 from pyasn1.type import tag
-from pyasn1.type import constraint
+from pyasn1.type import univ
 from pyasn1.type import useful
 
 MAX = float('inf')
 
+
 def _buildOid(*components):
     output = []
     for x in tuple(components):
diff --git a/pyasn1_modules/rfc6402.py b/pyasn1_modules/rfc6402.py
index c35f855..faee07f 100644
--- a/pyasn1_modules/rfc6402.py
+++ b/pyasn1_modules/rfc6402.py
@@ -11,7 +11,13 @@
 # ASN.1 source from:
 # http://www.ietf.org/rfc/rfc6402.txt
 #
-from pyasn1.type import univ, char, namedtype, namedval, tag, constraint, useful
+from pyasn1.type import char
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import namedval
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
 
 from pyasn1_modules import rfc4211
 from pyasn1_modules import rfc5280