No longer using obsolete base64 interface, fixes bug #30

2 files changed, 4 insertions, 4 deletions

diff --git a/rsa/pem.py b/rsa/pem.py
index b1c3a0e..0117ad1 100644
--- a/rsa/pem.py
+++ b/rsa/pem.py
@@ -89,7 +89,7 @@ def load_pem(contents, pem_marker):
 
     # Base64-decode the contents
     pem = b('').join(pem_lines)
-    return base64.decodestring(pem)
+    return base64.standard_b64decode(pem)
 
 
 def save_pem(contents, pem_marker):
@@ -106,7 +106,7 @@ def save_pem(contents, pem_marker):
 
     (pem_start, pem_end) = _markers(pem_marker)
 
-    b64 = base64.encodestring(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):
diff --git a/tests/test_load_save_keys.py b/tests/test_load_save_keys.py
index b2b4071..64f75de 100644
--- a/tests/test_load_save_keys.py
+++ b/tests/test_load_save_keys.py
@@ -23,10 +23,10 @@ from rsa._compat import b
 import rsa.key
 
 B64PRIV_DER = b('MC4CAQACBQDeKYlRAgMBAAECBQDHn4npAgMA/icCAwDfxwIDANcXAgInbwIDAMZt')
-PRIVATE_DER = base64.decodestring(B64PRIV_DER)
+PRIVATE_DER = base64.standard_b64decode(B64PRIV_DER)
 
 B64PUB_DER = b('MAwCBQDeKYlRAgMBAAE=')
-PUBLIC_DER = base64.decodestring(B64PUB_DER)
+PUBLIC_DER = base64.standard_b64decode(B64PUB_DER)
 
 PRIVATE_PEM = b('''
 -----BEGIN CONFUSING STUFF-----