summaryrefslogtreecommitdiff
path: root/rsa/pem.py
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2019-08-04 15:02:20 +0200
committerSybren A. Stüvel <sybren@stuvel.eu>2019-08-04 17:05:58 +0200
commitded036cf988b0cf4b20002d88434282f30762638 (patch)
treed927a9732226093ffcdf7400808ae45f5b9e6c37 /rsa/pem.py
parent65a81053d596c62ad2532c7e0e38e68ef61304bd (diff)
downloadrsa-git-ded036cf988b0cf4b20002d88434282f30762638.tar.gz
Removed compatibility code for Python 2.7 and 3.4
Diffstat (limited to 'rsa/pem.py')
-rw-r--r--rsa/pem.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/rsa/pem.py b/rsa/pem.py
index 2ddfae8..0650e64 100644
--- a/rsa/pem.py
+++ b/rsa/pem.py
@@ -18,15 +18,13 @@
import base64
-from rsa._compat import is_bytes, range
-
def _markers(pem_marker):
"""
Returns the start and end PEM markers, as bytes.
"""
- if not is_bytes(pem_marker):
+ if not isinstance(pem_marker, bytes):
pem_marker = pem_marker.encode('ascii')
return (b'-----BEGIN ' + pem_marker + b'-----',
@@ -49,7 +47,7 @@ def load_pem(contents, pem_marker):
"""
# We want bytes, not text. If it's text, it can be converted to ASCII bytes.
- if not is_bytes(contents):
+ if not isinstance(contents, bytes):
contents = contents.encode('ascii')
(pem_start, pem_end) = _markers(pem_marker)