Clean wrong imports of old Tag class

pwman/tests/crypto_tests.py

@@ -1,9 +1,7 @@
 import pwman.util.config as config
 import os
-import pwman.data.factory
-from pwman.data.nodes import NewNode
-from pwman.data.tags import Tag
-from pwman.util.crypto import CryptoEngine, CryptoException, CryptoNoCallbackException
+from pwman.util.crypto import (CryptoEngine, CryptoException,
+                               CryptoNoCallbackException)
 # set cls_timout to negative number (e.g. -1) to disable
 default_config = {'Global': {'umask': '0100', 'colors': 'yes',
                              'cls_timeout': '5'
@@ -30,7 +28,5 @@ class CryptoTest(unittest.TestCase):
         self.assertRaises((CryptoNoCallbackException,), crypto._getcipher)
 
     def test_prepare_data(self):
-        obj='dummy_data'
+        obj = 'dummy_data'
         self.assertTrue(True)
-
-

pwman/tests/db_tests.py

@@ -67,7 +67,7 @@ from pwman.data.nodes import NewNode
 from pwman.data.tags import TagNew
 from pwman.util.crypto import CryptoEngine, CryptoBadKeyException
 from pwman import which, default_config
-from pwman.ui.cli import get_pass_conf
+from pwman.ui.base import get_pass_conf
 from pwman.ui.tools import CMDLoop, CliMenuItem
 import unittest
 from pwman.data import factory

pwman/ui/cli.py

@@ -37,15 +37,6 @@ except ImportError, e:  # pragma: no cover
     _readline_available = False
 
 
-def get_pass_conf():
-    numerics = config.get_value("Generator", "numerics").lower() == 'true'
-    # TODO: allow custom leetifying through the config
-    leetify = config.get_value("Generator", "leetify").lower() == 'true'
-    special_chars = config.get_value("Generator", "special_chars"
-                                     ).lower() == 'true'
-    return numerics, leetify, special_chars
-
-
 class PwmanCliNew(cmd.Cmd, Aliases, BaseCommands):
     """
     Inherit from the BaseCommands and Aliases