diff options
author | Ilya Etingof <etingof@gmail.com> | 2016-03-27 23:45:18 +0200 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2016-03-27 23:45:18 +0200 |
commit | 2a5c89cd9890d34a77e8d9e2d715cf6bbef7bbd1 (patch) | |
tree | 4618d152b7cb1dc854844d26ba9955bf19bb9573 /pyasn1_modules/pem.py | |
parent | bc17ad0b90ec51a01b306a88e48fc22a7befb895 (diff) | |
download | pyasn1-modules-2a5c89cd9890d34a77e8d9e2d715cf6bbef7bbd1.tar.gz |
pep8 reformatted
Diffstat (limited to 'pyasn1_modules/pem.py')
-rw-r--r-- | pyasn1_modules/pem.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pyasn1_modules/pem.py b/pyasn1_modules/pem.py index ce99ac9..638e74e 100644 --- a/pyasn1_modules/pem.py +++ b/pyasn1_modules/pem.py @@ -8,16 +8,19 @@ import base64, sys stSpam, stHam, stDump = 0, 1, 2 + # The markers parameters is in form ('start1', 'stop1'), ('start2', 'stop2')... # Return is (marker-index, substrate) def readPemBlocksFromFile(fileObj, *markers): - startMarkers = dict(map(lambda x: (x[1],x[0]), + startMarkers = dict(map(lambda x: (x[1], x[0]), enumerate(map(lambda x: x[0], markers)))) - stopMarkers = dict(map(lambda x: (x[1],x[0]), + stopMarkers = dict(map(lambda x: (x[1], x[0]), enumerate(map(lambda x: x[1], markers)))) - idx = -1; substrate = '' + idx = -1 + substrate = '' + certLines = [] state = stSpam - while 1: + while True: certLine = fileObj.readline() if not certLine: break @@ -35,23 +38,25 @@ def readPemBlocksFromFile(fileObj, *markers): certLines.append(certLine) if state == stDump: if sys.version_info[0] <= 2: - substrate = ''.join([ base64.b64decode(x) for x in certLines ]) + substrate = ''.join([base64.b64decode(x) for x in certLines]) else: - substrate = ''.encode().join([ base64.b64decode(x.encode()) for x in certLines ]) + substrate = ''.encode().join([base64.b64decode(x.encode()) for x in certLines]) break return idx, substrate + # Backward compatibility routine -def readPemFromFile(fileObj, +def readPemFromFile(fileObj, startMarker='-----BEGIN CERTIFICATE-----', endMarker='-----END CERTIFICATE-----'): idx, substrate = readPemBlocksFromFile(fileObj, (startMarker, endMarker)) return substrate + def readBase64FromFile(fileObj): if sys.version_info[0] <= 2: - return ''.join([ base64.b64decode(x) for x in fileObj.readlines() ]) + return ''.join([base64.b64decode(x) for x in fileObj.readlines()]) else: return ''.encode().join( - [ base64.b64decode(x.encode()) for x in fileObj.readlines() ] + [base64.b64decode(x.encode()) for x in fileObj.readlines()] ) |