*.py: Use `str.replace' rather than `str.translate'.

It seems that the `None' argument to `str.translate' was a brief
experiment added in 2.6 which didn't survive into 3.0.

diff --git a/algorithms.py b/algorithms.py
index 0fa434a32246d1471016339d570a05a1f913c1ac..46abccbc7b8942217e61c8671f7bcc577cefb466 100644 (file)
--- a/algorithms.py
+++ b/algorithms.py
@@ -37,7 +37,7 @@ chacha20 chacha12 chacha8
 chacha20-ietf chacha12-ietf chacha8-ietf
 xchacha20 xchacha12 xchacha8
 '''.split()
 chacha20-ietf chacha12-ietf chacha8-ietf
 xchacha20 xchacha12 xchacha8
 '''.split()

-streamciphers += map(lambda s: s.translate(None, '/'), latindances)
+streamciphers += map(lambda s: s.replace('/', ''), latindances)

 hashes = '''
 md2 md4 md5 tiger has160
 sha sha224 sha256 sha512/224 sha512/256 sha384 sha512
 hashes = '''
 md2 md4 md5 tiger has160
 sha sha224 sha256 sha512/224 sha512/256 sha384 sha512


@@ -94,7 +94,7 @@ for i in latindances:
   if i.endswith('-ietf'): root += '_ietf'
   print ('\t_("%(name)s", %(root)s_keysz, %(id)s_rand, ' +
          'RNG_LATIN, %(ROOT)s_NONCESZ) \\') % \
   if i.endswith('-ietf'): root += '_ietf'
   print ('\t_("%(name)s", %(root)s_keysz, %(id)s_rand, ' +
          'RNG_LATIN, %(ROOT)s_NONCESZ) \\') % \

-      {'name': i, 'id': i.translate(None, '/').replace('-', '_'),
+      {'name': i, 'id': i.replace('/', '').replace('-', '_'),

        'root': root, 'ROOT': root.upper()}
 for i in [128, 256]:
   print ('\t_("shake%(w)d", shake%(w)d_keysz, cshake%(w)d_rand, ' +
        'root': root, 'ROOT': root.upper()}
 for i in [128, 256]:
   print ('\t_("shake%(w)d", shake%(w)d_keysz, cshake%(w)d_rand, ' +

diff --git a/catacomb/__init__.py b/catacomb/__init__.py
index e283744eff3378ca89f16e0d394558b56de8cfd8..5399182f76acebc44318244827984bb7112d10d4 100644 (file)
--- a/catacomb/__init__.py
+++ b/catacomb/__init__.py
@@ -46,7 +46,7 @@ def _fixname(name):
   name = name.replace('-', '_')
 
   ## But slashes might become underscores or just vanish.
   name = name.replace('-', '_')
 
   ## But slashes might become underscores or just vanish.

-  if name.startswith('salsa20'): name = name.translate(None, '/')
+  if name.startswith('salsa20'): name = name.replace('/', '')

   else: name = name.replace('/', '_')
 
   ## Done.
   else: name = name.replace('/', '_')
 
   ## Done.

diff --git a/catacomb/pwsafe.py b/catacomb/pwsafe.py
index cfbac7ed8e8081ff01707526dcf6a1040e8406af..03ed6852c9c98e9c2044caac6f5e49545fceb925 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."""
 
 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')
 def _unb64(s):
   """Decode S as base64 with trimmed `=' padding."""
   return (s + '='*((4 - len(s))%4)).decode('base64')