51d9b78cf8
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=156
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From 37a3628e3a3cd2d1f18e7834a151efab21b10433 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 94f4b4acce..7e8e6026b3 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
|
|
|
|
|