浏览代码

try working with pymysql only

oz123 10 年之前
父节点
当前提交
f0feccfe4a
共有 2 个文件被更改,包括 8 次插入9 次删除
  1. 4 5
      pwman/data/drivers/mysql.py
  2. 4 4
      pwman/tests/test_mysql.py

+ 4 - 5
pwman/data/drivers/mysql.py

@@ -26,11 +26,10 @@ from __future__ import print_function
 from pwman.data.database import Database, __DB_FORMAT__
 import sys
 
-if sys.version_info.major > 2:  # pragma: no cover
-    import pymysql as mysql
-    mysql.install_as_MySQLdb()
-else:
-    import MySQLdb as mysql
+import pymysql as mysql
+mysql.install_as_MySQLdb()
+#else:
+#    import MySQLdb as mysql
 
 
 class MySQLDatabase(Database):

+ 4 - 4
pwman/tests/test_mysql.py

@@ -24,10 +24,10 @@ 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
+#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