code cleanup (PyMySQL#929)

Author: methane

pymysql/connections.py

@@ -174,7 +174,7 @@ def __init__(
         sql_mode=None,
         read_default_file=None,
         conv=None,
-        use_unicode=None,
+        use_unicode=True,
         client_flag=0,
         cursorclass=Cursor,
         init_command=None,
@@ -203,9 +203,6 @@ def __init__(
         ssl_verify_cert=None,
         ssl_verify_identity=None,
     ):
-        if use_unicode is None and sys.version_info[0] > 2:
-            use_unicode = True
-
         if db is not None and database is None:
             database = db
         if passwd is not None and not password:
@@ -298,15 +295,9 @@ def _config(key, arg):
         if write_timeout is not None and write_timeout <= 0:
             raise ValueError("write_timeout should be > 0")
         self._write_timeout = write_timeout
-        if charset:
-            self.charset = charset
-            self.use_unicode = True
-        else:
-            self.charset = DEFAULT_CHARSET
-            self.use_unicode = False
 
-        if use_unicode is not None:
-            self.use_unicode = use_unicode
+        self.charset = charset or DEFAULT_CHARSET
+        self.use_unicode = use_unicode
 
         self.encoding = charset_by_name(self.charset).encoding
 

pymysql/tests/test_connection.py

@@ -403,7 +403,7 @@ def testMySQLOldPasswordAuth(self):
         c = conn.cursor()
 
         # deprecated in 5.6
-        if sys.version_info[0:2] >= (3, 2) and self.mysql_server_is(conn, (5, 6, 0)):
+        if self.mysql_server_is(conn, (5, 6, 0)):
             with self.assertWarns(pymysql.err.Warning) as cm:
                 c.execute("SELECT OLD_PASSWORD('%s')" % db["password"])
         else:
@@ -420,7 +420,7 @@ def testMySQLOldPasswordAuth(self):
         secure_auth_setting = c.fetchone()[0]
         c.execute("set old_passwords=1")
         # pymysql.err.Warning: 'pre-4.1 password hash' is deprecated and will be removed in a future release. Please use post-4.1 password hash instead
-        if sys.version_info[0:2] >= (3, 2) and self.mysql_server_is(conn, (5, 6, 0)):
+        if self.mysql_server_is(conn, (5, 6, 0)):
             with self.assertWarns(pymysql.err.Warning) as cm:
                 c.execute("set global secure_auth=0")
         else: