imports pep8'ed and optimized

14 files changed, 93 insertions, 36 deletions

diff --git a/tools/cmcdump.py b/tools/cmcdump.py
index bce48b1..d16774d 100755
--- a/tools/cmcdump.py
+++ b/tools/cmcdump.py
@@ -3,15 +3,20 @@
 # Read CMC certificate request with wrappers on stdin, parse each into
 # plain text, then build substrate from it
 #
-from pyasn1.codec.der import decoder, encoder
-from pyasn1_modules import rfc5652, rfc6402, pem
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc5652
+from pyasn1_modules import rfc6402
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat cmc_request.pem | %s""" % (sys.argv[0],))
     sys.exit(-1)
-    
+
 reqCnt = 0
 
 substrate = pem.readBase64FromFile(sys.stdin)
@@ -26,7 +31,7 @@ while next_layer:
         layer, rest = decoder.decode(data, asn1Spec=rfc5652.ContentInfo())
         assert encoder.encode(layer) == data, 'wrapper recode fails'
         assert not rest
-    
+
         print(" * New layer (wrapper):")
         print(layer.prettyPrint())
 
diff --git a/tools/cmpdump.py b/tools/cmpdump.py
index c89951a..ee8092b 100755
--- a/tools/cmpdump.py
+++ b/tools/cmpdump.py
@@ -8,24 +8,28 @@
 # Read ASN.1/PEM CMP message on stdin, parse into
 # plain text, then build substrate from it
 #
-from pyasn1.codec.der import decoder, encoder
-from pyasn1_modules import rfc4210, pem
-from pyasn1 import debug
 import sys
 
+from pyasn1 import debug
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc4210
+
 if len(sys.argv) == 2 and sys.argv[1] == '-d':
     debug.setLogger(debug.Debug('all'))
 elif len(sys.argv) != 1:
     print("""Usage:
 $ cat cmp.pem | %s [-d]""" % sys.argv[0])
     sys.exit(-1)
-    
+
 pkiMessage = rfc4210.PKIMessage()
 
 substrate = pem.readBase64FromFile(sys.stdin)
 if not substrate:
     sys.exit(0)
-        
+
 pkiMsg, rest = decoder.decode(substrate, asn1Spec=pkiMessage)
 
 print(pkiMsg.prettyPrint())
diff --git a/tools/crldump.py b/tools/crldump.py
index b871ddd..9731129 100755
--- a/tools/crldump.py
+++ b/tools/crldump.py
@@ -9,10 +9,14 @@
 # original wire format.
 # CRL can be generated with "openssl openssl ca -gencrl ..." commands.
 #
-from pyasn1_modules import rfc2459, pem
-from pyasn1.codec.der import encoder, decoder
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc2459
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat crl.pem | %s""" % sys.argv[0])
diff --git a/tools/crmfdump.py b/tools/crmfdump.py
index efb0ffc..854bfec 100755
--- a/tools/crmfdump.py
+++ b/tools/crmfdump.py
@@ -8,21 +8,25 @@
 # Read ASN.1/PEM X.509 CRMF request on stdin, parse into
 # plain text, then build substrate from it
 #
-from pyasn1.codec.der import decoder, encoder
-from pyasn1_modules import rfc2511, pem
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc2511
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat crmf.pem | %s""" % sys.argv[0])
     sys.exit(-1)
-    
+
 certReq = rfc2511.CertReqMessages()
 
 substrate = pem.readBase64FromFile(sys.stdin)
 if not substrate:
     sys.exit(0)
-        
+
 cr, rest = decoder.decode(substrate, asn1Spec=certReq)
 
 print(cr.prettyPrint())
diff --git a/tools/ocspclient.py b/tools/ocspclient.py
index 07ff5ad..2827604 100755
--- a/tools/ocspclient.py
+++ b/tools/ocspclient.py
@@ -10,13 +10,17 @@ import sys
 
 try:
     import urllib2
+
 except ImportError:
     import urllib.request as urllib2
 
-from pyasn1.codec.der import decoder, encoder
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
 from pyasn1.type import univ
 
-from pyasn1_modules import rfc2560, rfc2459, pem
+from pyasn1_modules import rfc2560
+from pyasn1_modules import rfc2459
+from pyasn1_modules import pem
 
 sha1oid = univ.ObjectIdentifier((1, 3, 14, 3, 2, 26))
 
diff --git a/tools/ocspreqdump.py b/tools/ocspreqdump.py
index 40c088a..f613f3a 100755
--- a/tools/ocspreqdump.py
+++ b/tools/ocspreqdump.py
@@ -8,10 +8,14 @@
 # Read ASN.1/PEM X.509 CRMF request on stdin, parse into
 # plain text, then build substrate from it
 #
-from pyasn1.codec.der import decoder, encoder
-from pyasn1_modules import rfc2560, pem
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc2560
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat ocsp-request.pem | %s""" % sys.argv[0])
diff --git a/tools/ocsprspdump.py b/tools/ocsprspdump.py
index ca52f64..3535795 100755
--- a/tools/ocsprspdump.py
+++ b/tools/ocsprspdump.py
@@ -8,10 +8,14 @@
 # Read ASN.1/PEM OCSP response on stdin, parse into
 # plain text, then build substrate from it
 #
-from pyasn1.codec.der import decoder, encoder
-from pyasn1_modules import rfc2560, pem
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc2560
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat ocsp-response.pem | %s""" % sys.argv[0])
diff --git a/tools/pkcs10dump.py b/tools/pkcs10dump.py
index 56417ae..e8c6da5 100755
--- a/tools/pkcs10dump.py
+++ b/tools/pkcs10dump.py
@@ -8,10 +8,14 @@
 # Read ASN.1/PEM X.509 certificate requests (PKCS#10 format) on stdin, 
 # parse each into plain text, then build substrate from it
 #
-from pyasn1.codec.der import decoder, encoder
-from pyasn1_modules import rfc2314, pem
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc2314
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat certificateRequest.pem | %s""" % sys.argv[0])
diff --git a/tools/pkcs1dump.py b/tools/pkcs1dump.py
index f205d77..520fc4c 100755
--- a/tools/pkcs1dump.py
+++ b/tools/pkcs1dump.py
@@ -9,10 +9,15 @@
 # stdin, print them pretty and encode back into original wire format.
 # Private keys can be generated with "openssl genrsa|gendsa" commands.
 #
-from pyasn1_modules import rfc2459, rfc2437, pem
-from pyasn1.codec.der import encoder, decoder
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc2437
+from pyasn1_modules import rfc2459
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat rsakey.pem | %s""" % sys.argv[0])
diff --git a/tools/pkcs7dump.py b/tools/pkcs7dump.py
index 72fe70d..c01e19c 100755
--- a/tools/pkcs7dump.py
+++ b/tools/pkcs7dump.py
@@ -8,10 +8,14 @@
 # Read ASN.1/PEM PKCS#7 on stdin, parse it into plain text,
 # then build substrate from it
 #
-from pyasn1_modules import rfc2315, pem
-from pyasn1.codec.der import encoder, decoder
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc2315
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat pkcs7Certificate.pem | %s""" % sys.argv[0])
diff --git a/tools/pkcs8dump.py b/tools/pkcs8dump.py
index 2bb8388..d645a87 100755
--- a/tools/pkcs8dump.py
+++ b/tools/pkcs8dump.py
@@ -8,10 +8,14 @@
 # Read  bunch of ASN.1/PEM plain/encrypted private keys in PKCS#8 
 # format on stdin, parse each into plain text, then build substrate from it
 #
-from pyasn1.codec.der import decoder, encoder
-from pyasn1_modules import rfc5208, pem
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc5208
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat pkcs8key.pem | %s""" % sys.argv[0])
diff --git a/tools/snmpget.py b/tools/snmpget.py
index cd9fec2..877d521 100755
--- a/tools/snmpget.py
+++ b/tools/snmpget.py
@@ -7,10 +7,13 @@
 #
 # Generate SNMPGET request, parse response
 #
-from pyasn1.codec.ber import encoder, decoder
-from pyasn1_modules import rfc1157
-import sys
 import socket
+import sys
+
+from pyasn1.codec.ber import decoder
+from pyasn1.codec.ber import encoder
+
+from pyasn1_modules import rfc1157
 
 if len(sys.argv) != 4:
     print("""Usage:
diff --git a/tools/x509dump-rfc5280.py b/tools/x509dump-rfc5280.py
index 482df7e..d1ae38b 100755
--- a/tools/x509dump-rfc5280.py
+++ b/tools/x509dump-rfc5280.py
@@ -10,10 +10,14 @@
 # Read ASN.1/PEM X.509 certificates on stdin, parse each into plain text,
 # then build substrate from it (using RFC5280)
 #
-from pyasn1.codec.der import decoder, encoder
-from pyasn1_modules import rfc5280, pem
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc5280
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat CACertificate.pem | %s
diff --git a/tools/x509dump.py b/tools/x509dump.py
index 2c51c6a..5a36915 100755
--- a/tools/x509dump.py
+++ b/tools/x509dump.py
@@ -8,10 +8,14 @@
 # Read ASN.1/PEM X.509 certificates on stdin, parse each into plain text,
 # then build substrate from it
 #
-from pyasn1.codec.der import decoder, encoder
-from pyasn1_modules import rfc2459, pem
 import sys
 
+from pyasn1.codec.der import decoder
+from pyasn1.codec.der import encoder
+
+from pyasn1_modules import pem
+from pyasn1_modules import rfc2459
+
 if len(sys.argv) != 1:
     print("""Usage:
 $ cat CACertificate.pem | %s