File fall-back-to-pymysql.patch of Package salt.15446

Overview Repositories Revisions Requests Users Attributes Meta

File fall-back-to-pymysql.patch of Package salt.15446

From f0098b4b9e5abaaca7bbc6c17f5a60bb2129dda5 Mon Sep 17 00:00:00 2001
From: Maximilian Meister <mmeister@suse.de>
Date: Thu, 5 Apr 2018 13:23:23 +0200
Subject: [PATCH] fall back to PyMySQL

same is already done in modules (see #26803)

Signed-off-by: Maximilian Meister <mmeister@suse.de>
---
 salt/modules/mysql.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/modules/mysql.py b/salt/modules/mysql.py
index 87e2361e28..e785e5219c 100644
--- a/salt/modules/mysql.py
+++ b/salt/modules/mysql.py
@@ -58,7 +58,7 @@ try:
     import MySQLdb.cursors
     import MySQLdb.converters
     from MySQLdb.constants import FIELD_TYPE, FLAG
-    from MySQLdb import OperationalError
+    from MySQLdb.connections import OperationalError
 except ImportError:
     try:
         # MySQLdb import failed, try to import PyMySQL
@@ -68,7 +68,7 @@ except ImportError:
         import MySQLdb.cursors
         import MySQLdb.converters
         from MySQLdb.constants import FIELD_TYPE, FLAG
-        from MySQLdb import OperationalError
+        from MySQLdb.err import OperationalError
     except ImportError:
         MySQLdb = None
 
-- 
2.16.4

Places

File fall-back-to-pymysql.patch of Package salt.15446

Places