diff options
author | adamantike <mike@fmanganiello.com.ar> | 2016-05-08 15:36:57 -0300 |
---|---|---|
committer | adamantike <mike@fmanganiello.com.ar> | 2016-05-08 15:41:47 -0300 |
commit | 9f57740ec47f828b2be0cf0a104638c4abee9c3d (patch) | |
tree | 97815e235b5237035706d7cd2791e22cc5fdb548 /rsa/pem.py | |
parent | 505a25a1ada6f0d2b161ac7d12e626c7965f16f5 (diff) | |
download | rsa-git-9f57740ec47f828b2be0cf0a104638c4abee9c3d.tar.gz |
Drop byte_literal in favour of b''
Diffstat (limited to 'rsa/pem.py')
-rw-r--r-- | rsa/pem.py | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -18,7 +18,7 @@ import base64 -from rsa._compat import b, is_bytes, range +from rsa._compat import is_bytes, range def _markers(pem_marker): @@ -29,8 +29,8 @@ def _markers(pem_marker): if not is_bytes(pem_marker): pem_marker = pem_marker.encode('ascii') - return (b('-----BEGIN ') + pem_marker + b('-----'), - b('-----END ') + pem_marker + b('-----')) + return (b'-----BEGIN ' + pem_marker + b'-----', + b'-----END ' + pem_marker + b'-----') def load_pem(contents, pem_marker): @@ -82,7 +82,7 @@ def load_pem(contents, pem_marker): break # Load fields - if b(':') in line: + if b':' in line: continue pem_lines.append(line) @@ -95,7 +95,7 @@ def load_pem(contents, pem_marker): raise ValueError('No PEM end marker "%s" found' % pem_end) # Base64-decode the contents - pem = b('').join(pem_lines) + pem = b''.join(pem_lines) return base64.standard_b64decode(pem) @@ -113,7 +113,7 @@ def save_pem(contents, pem_marker): (pem_start, pem_end) = _markers(pem_marker) - b64 = base64.standard_b64encode(contents).replace(b('\n'), b('')) + b64 = base64.standard_b64encode(contents).replace(b'\n', b'') pem_lines = [pem_start] for block_start in range(0, len(b64), 64): @@ -121,6 +121,6 @@ def save_pem(contents, pem_marker): pem_lines.append(block) pem_lines.append(pem_end) - pem_lines.append(b('')) + pem_lines.append(b'') - return b('\n').join(pem_lines) + return b'\n'.join(pem_lines) |