Removed test-specific functionality from CryptedFileKeyring - instead have the test runner patch the behavior.

Author: jaraco

keyring/backend.py

@@ -456,12 +456,6 @@ def supported(self):
             status = -1
         return status
 
-    def _getpass(self, *args, **kwargs):
-        """Wrap getpass.getpass(), so that we can override it when testing.
-        """
-
-        return getpass.getpass(*args, **kwargs)
-
     @properties.NonDataProperty
     def keyring_key(self):
         # _unlock or _init_file will set the key or raise an exception
@@ -470,9 +464,9 @@ def keyring_key(self):
 
     def _get_new_password(self):
         while True:
-            password = self._getpass(
+            password = getpass.getpass(
                 "Please set a password for your new keyring: ")
-            confirm = self._getpass('Please confirm the password: ')
+            confirm = getpass.getpass('Please confirm the password: ')
             if password != confirm:
                 sys.stderr.write("Error: Your passwords didn't match\n")
                 continue
@@ -515,7 +509,7 @@ def _unlock(self):
         Unlock this keyring by getting the password for the keyring from the
         user.
         """
-        self.keyring_key = self._getpass(
+        self.keyring_key = getpass.getpass(
             'Please enter password for encrypted keyring: ')
         try:
             ref_pw = self.get_password('keyring-setting', 'password reference')
@@ -590,7 +584,7 @@ def __convert_0_9_1(self, keyring_password):
         IV = head[self.block_size:]
 
         if keyring_password is None:
-            keyring_password = self._getpass(
+            keyring_password = getpass.getpass(
                 "Please input your password for the keyring: ")
 
         cipher = self._create_cipher(keyring_password, salt, IV)
@@ -640,7 +634,7 @@ def __convert_0_9_0(self, keyring_password):
         import crypt
 
         if keyring_password is None:
-            keyring_password = self._getpass(
+            keyring_password = getpass.getpass(
                 "Please input your password for the keyring: ")
 
         hashed = crypt.crypt(keyring_password, keyring_password)

keyring/tests/test_backend.py

@@ -13,6 +13,7 @@
 import sys
 import tempfile
 import types
+import getpass
 
 try:
     # Python < 2.7 annd Python >= 3.0 < 3.1
@@ -364,7 +365,13 @@ class CryptedFileKeyringTestCase(FileKeyringTests, unittest.TestCase):
 
     def setUp(self):
         super(self.__class__, self).setUp()
-        self.keyring._getpass = lambda *args, **kwargs: "abcdef"
+        # patch the getpass module to bypass user input
+        self.getpass_orig = getpass.getpass
+        getpass.getpass = lambda *args, **kwargs: "abcdef"
+
+    def tearDown(self):
+        getpass.getpass = self.getpass_orig
+        del self.getpass_orig
 
     def init_keyring(self):
         return keyring.backend.CryptedFileKeyring()