Rename symmetric encryption function to be shorter.

3 files changed, 7 insertions, 7 deletions

diff --git a/obnamlib/__init__.py b/obnamlib/__init__.py
index 4ec79e2b..b8157123 100644
--- a/obnamlib/__init__.py
+++ b/obnamlib/__init__.py
@@ -40,8 +40,8 @@ MAX_ID = 2**64 - 1
 from sizeparse import SizeSyntaxError, UnitNameError, ByteSizeParser
 
 from encryption import (generate_symmetric_key,
-                        encrypt_with_symmetric_key,
-                        decrypt_with_symmetric_key,
+                        encrypt_symmetric,
+                        decrypt_symmetric,
                         get_public_key,
                         Keyring,
                         SecretKeyring,
diff --git a/obnamlib/encryption.py b/obnamlib/encryption.py
index 0615eb14..8c064f61 100644
--- a/obnamlib/encryption.py
+++ b/obnamlib/encryption.py
@@ -81,12 +81,12 @@ def _gpg_pipe(args, data, passphrase):
     return out
     
     
-def encrypt_with_symmetric_key(cleartext, key):
+def encrypt_symmetric(cleartext, key):
     '''Encrypt data with symmetric encryption.'''
     return _gpg_pipe(['-c'], cleartext, key)
     
     
-def decrypt_with_symmetric_key(encrypted, key):
+def decrypt_symmetric(encrypted, key):
     '''Decrypt encrypted data with symmetric encryption.'''
     return _gpg_pipe(['-d'], encrypted, key)
 
diff --git a/obnamlib/encryption_tests.py b/obnamlib/encryption_tests.py
index a2bee718..ece3a13b 100644
--- a/obnamlib/encryption_tests.py
+++ b/obnamlib/encryption_tests.py
@@ -51,14 +51,14 @@ class SymmetricEncryptionTests(unittest.TestCase):
     def test_encrypts_into_different_string_than_cleartext(self):
         cleartext = 'hello world'
         key = 'sekr1t'
-        encrypted = obnamlib.encrypt_with_symmetric_key(cleartext, key)
+        encrypted = obnamlib.encrypt_symmetric(cleartext, key)
         self.assertNotEqual(cleartext, encrypted)
 
     def test_encrypt_decrypt_round_trip(self):
         cleartext = 'hello, world'
         key = 'sekr1t'
-        encrypted = obnamlib.encrypt_with_symmetric_key(cleartext, key)
-        decrypted = obnamlib.decrypt_with_symmetric_key(encrypted, key)
+        encrypted = obnamlib.encrypt_symmetric(cleartext, key)
+        decrypted = obnamlib.decrypt_symmetric(encrypted, key)
         self.assertEqual(decrypted, cleartext)