ZMySQLDA etc.: support mysqlclient >= 1.4.0.

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Catalog.py

@@ -38,7 +38,7 @@ from AccessControl import getSecurityManager
 from AccessControl.SecurityManagement import newSecurityManager
 from Acquisition import aq_base
 from DateTime import DateTime
-from _mysql_exceptions import ProgrammingError
+from MySQLdb import ProgrammingError
 from OFS.ObjectManager import ObjectManager
 from Products.CMFActivity import ActivityTool
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testIdTool.py

@@ -32,7 +32,7 @@ import unittest
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.tests.utils import createZODBPythonScript
-from _mysql_exceptions import ProgrammingError
+from MySQLdb import ProgrammingError
 
 class TestIdTool(ERP5TypeTestCase):
 

product/CMFActivity/tests/testCMFActivity.py

@@ -47,7 +47,7 @@ from ZODB.POSException import ConflictError
 from DateTime import DateTime
 from Products.CMFActivity.ActivityTool import (
   cancelProcessShutdown, Message, getCurrentNode, getServerAddress)
-from _mysql_exceptions import OperationalError
+from MySQLdb import OperationalError
 from Products.ZMySQLDA.db import DB
 import gc
 import random

product/ERP5/Document/SQLNonContinuousIncreasingIdGenerator.py

@@ -32,7 +32,7 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.Utils import ScalarMaxConflictResolver
 from Products.ERP5.Document.IdGenerator import IdGenerator
-from _mysql_exceptions import ProgrammingError
+from MySQLdb import ProgrammingError
 from MySQLdb.constants.ER import NO_SUCH_TABLE
 from zLOG import LOG, INFO
 from BTrees.OOBTree import OOBTree

product/ZMySQLDA/db.py

@@ -88,11 +88,10 @@ __version__='$Revision: 1.20 $'[11:-2]
 
 import os
 import re
-import _mysql
 import MySQLdb
+from MySQLdb import OperationalError, NotSupportedError, ProgrammingError, _mysql
 import warnings
 from contextlib import contextmanager, nested
-from _mysql_exceptions import OperationalError, NotSupportedError, ProgrammingError
 from Products.ERP5Type.Timeout import TimeoutReachedError, getTimeLeft
 MySQLdb_version_required = (0,9,2)
 

product/ZMySQLDA/tests/testDeferredConnection.py

@@ -28,7 +28,7 @@
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from AccessControl.SecurityManagement import newSecurityManager
-from _mysql_exceptions import OperationalError
+from MySQLdb import OperationalError
 from Products.ZMySQLDA.db import hosed_connection
 
 UNCONNECTED_STATE = 0

product/ZMySQLDA/tests/testTableStructureMigration.py

@@ -28,7 +28,7 @@
 
 from textwrap import dedent
 
-from _mysql_exceptions import OperationalError
+from MySQLdb import OperationalError
 from Shared.DC.ZRDB.DA import DA
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase