Merge pull request #775 from seleniumbase/update-the-mysql-connector

Update the Python MySQL connector

Author: mdmintz

examples/translations/pytest.ini

@@ -3,7 +3,7 @@
 # Let console output be seen. Don't override the pytest plugin.
 addopts = --capture=no --ignore conftest.py -p no:cacheprovider
 
-# Ignore warnings such as DeprecationWarning and pytest.PytestUnknownMarkWarning
+# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
 filterwarnings =
     ignore::pytest.PytestWarning
     ignore:.*U.*mode is deprecated:DeprecationWarning

pytest.ini

@@ -3,7 +3,7 @@
 # Let console output be seen. Don't override the pytest plugin.
 addopts = --capture=no --ignore conftest.py -p no:cacheprovider
 
-# Ignore warnings such as DeprecationWarning and pytest.PytestUnknownMarkWarning
+# Ignore warnings such as DeprecationWarning and PytestUnknownMarkWarning
 filterwarnings =
     ignore::pytest.PytestWarning
     ignore:.*U.*mode is deprecated:DeprecationWarning

requirements.txt

@@ -46,7 +46,8 @@ soupsieve==1.9.6;python_version<"3.5"
 soupsieve==2.0.1;python_version>="3.5" and python_version<"3.6"
 soupsieve==2.1;python_version>="3.6"
 beautifulsoup4==4.9.3
-cryptography==3.0;python_version<"3.6"
+cryptography==2.9.2;python_version<"3.5"
+cryptography==3.0;python_version>="3.5" and python_version<"3.6"
 cryptography==3.3.1;python_version>="3.6"
 pyopenssl==19.1.0;python_version<"3.6"
 pyopenssl==20.0.1;python_version>="3.6"
@@ -64,7 +65,8 @@ colorama==0.4.4
 pathlib2==2.3.5;python_version<"3.5"
 importlib-metadata==2.0.0;python_version<"3.6"
 virtualenv>=20.2.2
-pymysql==0.10.1
+pymysql==0.10.1;python_version<"3.6"
+pymysql==1.0.0;python_version>="3.6"
 coverage==5.3.1
 brython==3.9.1
 pyotp==2.4.1

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "1.51.9"
+__version__ = "1.51.10"

seleniumbase/core/mysql.py

@@ -2,6 +2,7 @@
 Wrapper for MySQL DB functions to make life easier.
 """
 
+import sys
 import time
 from seleniumbase import config as sb_config
 from seleniumbase.config import settings
@@ -40,11 +41,21 @@ def __init__(self, database_env='test', conf_creds=None):
         count = 0
         while count < retry_count:
             try:
-                self.conn = pymysql.connect(host=db_server,
-                                            port=db_port,
-                                            user=db_user,
-                                            passwd=db_pass,
-                                            db=db_schema)
+                if sys.version_info[0] == 3 and sys.version_info[1] >= 6 or (
+                        sys.version_info[0] > 3):
+                    # PyMySQL 1.0.0 or above renamed the variables.
+                    self.conn = pymysql.connect(host=db_server,
+                                                port=db_port,
+                                                user=db_user,
+                                                password=db_pass,
+                                                database=db_schema)
+                else:
+                    # PyMySQL 0.10.1 for Python 2.7 and Python 3.5
+                    self.conn = pymysql.connect(host=db_server,
+                                                port=db_port,
+                                                user=db_user,
+                                                passwd=db_pass,
+                                                db=db_schema)
                 self.conn.autocommit(True)
                 self.cursor = self.conn.cursor()
                 return

setup.py

@@ -150,7 +150,8 @@
         'soupsieve==2.0.1;python_version>="3.5" and python_version<"3.6"',
         'soupsieve==2.1;python_version>="3.6"',
         'beautifulsoup4==4.9.3',
-        'cryptography==3.0;python_version<"3.6"',
+        'cryptography==2.9.2;python_version<"3.5"',
+        'cryptography==3.0;python_version>="3.5" and python_version<"3.6"',
         'cryptography==3.3.1;python_version>="3.6"',
         'pyopenssl==19.1.0;python_version<"3.6"',
         'pyopenssl==20.0.1;python_version>="3.6"',
@@ -168,7 +169,8 @@
         'pathlib2==2.3.5;python_version<"3.5"',  # Sync with "virtualenv"
         'importlib-metadata==2.0.0;python_version<"3.6"',  # Sync "virtualenv"
         'virtualenv>=20.2.2',  # Sync with importlib-metadata and pathlib2
-        'pymysql==0.10.1',
+        'pymysql==0.10.1;python_version<"3.6"',
+        'pymysql==1.0.0;python_version>="3.6"',
         'coverage==5.3.1',
         'brython==3.9.1',
         'pyotp==2.4.1',