*.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 3ceb207b175fd4de8d7ab3c5c1401b5c790101a1..84ea439e43b0a547c8ebc363e8e2606de1c6d68d 100644 (file)
--- a/algorithms.py
+++ b/algorithms.py
@@ -33,7 +33,7 @@ latindances = '''
 salsa20 salsa20/12 salsa20/8 xsalsa20 xsalsa20/12 xsalsa20/8
 chacha20 chacha12 chacha8 xchacha20 xchacha12 xchacha8
 '''.split()
 salsa20 salsa20/12 salsa20/8 xsalsa20 xsalsa20/12 xsalsa20/8
 chacha20 chacha12 chacha8 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 sha384 sha512
 hashes = '''
 md2 md4 md5 tiger has160
 sha sha224 sha256 sha384 sha512


@@ -86,7 +86,7 @@ for i in latindances:
     raise ValueError, 'failed to find root name for %s' % i
   print ('\t_("%(name)s", %(root)s_keysz, %(id)s_rand, ' +
          'RNGF_NONCE, %(ROOT)s_NONCESZ) \\') % \
     raise ValueError, 'failed to find root name for %s' % i
   print ('\t_("%(name)s", %(root)s_keysz, %(id)s_rand, ' +
          'RNGF_NONCE, %(ROOT)s_NONCESZ) \\') % \

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

        'root': root, 'ROOT': root.upper()}
 print '\t/* end */'
 print
        'root': root, 'ROOT': root.upper()}
 print '\t/* end */'
 print

diff --git a/catacomb/__init__.py b/catacomb/__init__.py
index f79b4d29b210c56129138a0c08607dff637d5bca..d29aa9531a96e9150ab02243f194dd2817f24e22 100644 (file)
--- a/catacomb/__init__.py
+++ b/catacomb/__init__.py
@@ -42,7 +42,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 4b4b99494eef210f344378e4bb7e5f88b6f4fd45..f3af1b93668e2a407df3897c1ffe0acc0f337f07 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')