summaryrefslogtreecommitdiff
path: root/dev-python/pymysql/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/pymysql/files')
-rw-r--r--dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch22
-rw-r--r--dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch30
2 files changed, 52 insertions, 0 deletions
diff --git a/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch b/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch
new file mode 100644
index 000000000000..f850c9be7262
--- /dev/null
+++ b/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch
@@ -0,0 +1,22 @@
+From 3e71dd32e8ce868b090c282759eebdeabc960f58 Mon Sep 17 00:00:00 2001
+From: Inada Naoki <songofacandy@gmail.com>
+Date: Tue, 28 Jul 2020 13:06:07 +0900
+Subject: [PATCH] Add missing import (#879)
+
+Fixes #878
+---
+ pymysql/converters.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pymysql/converters.py b/pymysql/converters.py
+index b084ed2f..1b582904 100644
+--- a/pymysql/converters.py
++++ b/pymysql/converters.py
+@@ -5,6 +5,7 @@
+ import re
+ import time
+
++from .err import ProgrammingError
+ from .constants import FIELD_TYPE
+
+
diff --git a/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch b/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch
new file mode 100644
index 000000000000..aa9bc53b0358
--- /dev/null
+++ b/dev-python/pymysql/files/pymysql-0.10.0-fix-tests.patch
@@ -0,0 +1,30 @@
+--- a/pymysql/tests/test_connection.py
++++ b/pymysql/tests/test_connection.py
+@@ -70,6 +70,9 @@ class TestAuthentication(base.PyMySQLTestCase):
+ for r in cur:
+ if (r[1], r[2]) != (u'ACTIVE', u'AUTHENTICATION'):
+ continue
++ if r[0] == u'unix_socket':
++ socket_plugin_name = r[0]
++ socket_found = True
+ if r[3] == u'auth_socket.so':
+ socket_plugin_name = r[0]
+ socket_found = True
+@@ -188,7 +191,7 @@ class TestAuthentication(base.PyMySQLTestCase):
+ cur.execute("install plugin two_questions soname 'dialog_examples.so'")
+ TestAuthentication.two_questions_found = True
+ self.realTestDialogAuthTwoQuestions()
+- except pymysql.err.InternalError:
++ except pymysql.err.OperationalError:
+ pytest.skip('we couldn\'t install the two_questions plugin')
+ finally:
+ if TestAuthentication.two_questions_found:
+@@ -218,7 +221,7 @@ class TestAuthentication(base.PyMySQLTestCase):
+ cur.execute("install plugin three_attempts soname 'dialog_examples.so'")
+ TestAuthentication.three_attempts_found = True
+ self.realTestDialogAuthThreeAttempts()
+- except pymysql.err.InternalError:
++ except pymysql.err.OperationalError:
+ pytest.skip('we couldn\'t install the three_attempts plugin')
+ finally:
+ if TestAuthentication.three_attempts_found: