Merge branch '1.3.x'

[catacomb-python] / catacomb / pwsafe.py

diff --git a/catacomb/pwsafe.py b/catacomb/pwsafe.py
index 4b4b994..03ed685 100644 (file)
--- a/catacomb/pwsafe.py
+++ b/catacomb/pwsafe.py
@@ -80,7 +80,7 @@ def _dec_metaname(name):
 
 def _b64(s):
   """Encode S as base64, without newlines, and trimming `=' padding."""
-  return s.encode('base64').translate(None, '\n=')
+  return s.encode('base64').replace('\n', '').rstrip('=')
 def _unb64(s):
   """Decode S as base64 with trimmed `=' padding."""
   return (s + '='*((4 - len(s))%4)).decode('base64')
@@ -472,7 +472,7 @@ class StorageBackend (object):
     database is open for writing.
     """
     me._check_write()
-    me._del_passwd(label, payload)
+    me._del_passwd(label)
 
   def iter_passwds(me):
     """