diff options
author | Ilya Etingof <etingof@gmail.com> | 2017-08-05 12:12:08 +0200 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2017-08-05 12:18:21 +0200 |
commit | 7ef20604f221bd665a7fcd36a71874646c6e58ef (patch) | |
tree | 11c0c69a55c17c516e478348c45a3d835230b0ff /pyasn1_modules/pem.py | |
parent | 43f2ed528ab07315b73a19ccb920c6c9509dd417 (diff) | |
download | pyasn1-modules-7ef20604f221bd665a7fcd36a71874646c6e58ef.tar.gz |
tests refactored into unit tests
Diffstat (limited to 'pyasn1_modules/pem.py')
-rw-r--r-- | pyasn1_modules/pem.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pyasn1_modules/pem.py b/pyasn1_modules/pem.py index 913f96d..9f16308 100644 --- a/pyasn1_modules/pem.py +++ b/pyasn1_modules/pem.py @@ -54,10 +54,12 @@ def readPemFromFile(fileObj, return substrate -def readBase64FromFile(fileObj): +def readBase64fromText(text): if sys.version_info[0] <= 2: - return ''.join([base64.b64decode(x) for x in fileObj.readlines()]) + return base64.b64decode(text) else: - return ''.encode().join( - [base64.b64decode(x.encode()) for x in fileObj.readlines()] - ) + return base64.b64decode(text.encode()) + + +def readBase64FromFile(fileObj): + return readBase64fromText(fileObj.read()) |