Clean up mysql and add new ui method

pwman/data/drivers/mysql.py

@@ -24,7 +24,6 @@
 """MySQL Database implementation."""
 from __future__ import print_function
 from pwman.data.database import Database, __DB_FORMAT__
-import sys
 
 import pymysql as mysql
 mysql.install_as_MySQLdb()

pwman/tests/test_base_ui.py

@@ -187,6 +187,12 @@ class TestBaseUI(unittest.TestCase):
         self.assertNotIn('alice', sys.stdout.getvalue())
         sys.stdout = sys.__stdout__
 
+    def test_10_do_info(self):
+        self.output = StringIO()
+        sys.stdout = self.output
+        self.tester.cli.do_info('')
+        self.assertIn("test.pwman.db", sys.stdout.getvalue())
+
 if __name__ == '__main__':
 
     ce = CryptoEngine.get()

pwman/tests/test_mysql.py

@@ -24,10 +24,7 @@ if sys.version_info.major > 2:  # pragma: no cover
 else:  # pragma: no cover
     from urlparse import urlparse
 
-#if sys.version_info.major > 2:
 from pymysql import connections
-#else:
-#    from MySQLdb import connections
 from pwman.data.drivers.mysql import MySQLDatabase
 from pwman.util.crypto_engine import CryptoEngine
 

pwman/ui/baseui.py

@@ -135,6 +135,9 @@ class HelpUIMixin(object):  # pragma: no cover
         self._usage("tags")
         print("Displays all tags in used in the database.")
 
+    def help_info(self):
+        print("Show information about the current database.")
+
 
 class AliasesMixin(object):  # pragma: no cover
     """
@@ -471,3 +474,7 @@ class BaseCommands(HelpUIMixin, AliasesMixin):
     def do_delete(self, args):  # pragma: no cover
         CryptoEngine.get()
         self._do_rm(args)
+
+    def do_info(self, args):
+        print("Currently connected to: {}".format(
+              self.config.get_value("Database", "dburi")))