Commit a7752d21 authored by Kazuhiko's avatar Kazuhiko Committed by Kazuhiko Shiozaki

ZMySQLDA etc.: support mysqlclient >= 1.4.0.

parent 2cb0b714
...@@ -38,7 +38,7 @@ from AccessControl import getSecurityManager ...@@ -38,7 +38,7 @@ from AccessControl import getSecurityManager
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from Acquisition import aq_base from Acquisition import aq_base
from DateTime import DateTime from DateTime import DateTime
from _mysql_exceptions import ProgrammingError from MySQLdb import ProgrammingError
from OFS.ObjectManager import ObjectManager from OFS.ObjectManager import ObjectManager
from Products.CMFActivity import ActivityTool from Products.CMFActivity import ActivityTool
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
......
...@@ -32,7 +32,7 @@ import unittest ...@@ -32,7 +32,7 @@ import unittest
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import createZODBPythonScript from Products.ERP5Type.tests.utils import createZODBPythonScript
from _mysql_exceptions import ProgrammingError from MySQLdb import ProgrammingError
class TestIdTool(ERP5TypeTestCase): class TestIdTool(ERP5TypeTestCase):
......
...@@ -47,7 +47,7 @@ from ZODB.POSException import ConflictError ...@@ -47,7 +47,7 @@ from ZODB.POSException import ConflictError
from DateTime import DateTime from DateTime import DateTime
from Products.CMFActivity.ActivityTool import ( from Products.CMFActivity.ActivityTool import (
cancelProcessShutdown, Message, getCurrentNode, getServerAddress) cancelProcessShutdown, Message, getCurrentNode, getServerAddress)
from _mysql_exceptions import OperationalError from MySQLdb import OperationalError
from Products.ZMySQLDA.db import DB from Products.ZMySQLDA.db import DB
import gc import gc
import random import random
......
...@@ -32,7 +32,7 @@ from AccessControl import ClassSecurityInfo ...@@ -32,7 +32,7 @@ from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions, PropertySheet, interfaces from Products.ERP5Type import Permissions, PropertySheet, interfaces
from Products.ERP5Type.Utils import ScalarMaxConflictResolver from Products.ERP5Type.Utils import ScalarMaxConflictResolver
from Products.ERP5.Document.IdGenerator import IdGenerator 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 MySQLdb.constants.ER import NO_SUCH_TABLE
from zLOG import LOG, INFO from zLOG import LOG, INFO
from BTrees.OOBTree import OOBTree from BTrees.OOBTree import OOBTree
......
...@@ -88,11 +88,10 @@ __version__='$Revision: 1.20 $'[11:-2] ...@@ -88,11 +88,10 @@ __version__='$Revision: 1.20 $'[11:-2]
import os import os
import re import re
import _mysql
import MySQLdb import MySQLdb
from MySQLdb import OperationalError, NotSupportedError, ProgrammingError, _mysql
import warnings import warnings
from contextlib import contextmanager, nested from contextlib import contextmanager, nested
from _mysql_exceptions import OperationalError, NotSupportedError, ProgrammingError
from Products.ERP5Type.Timeout import TimeoutReachedError, getTimeLeft from Products.ERP5Type.Timeout import TimeoutReachedError, getTimeLeft
MySQLdb_version_required = (0,9,2) MySQLdb_version_required = (0,9,2)
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from _mysql_exceptions import OperationalError from MySQLdb import OperationalError
from Products.ZMySQLDA.db import hosed_connection from Products.ZMySQLDA.db import hosed_connection
UNCONNECTED_STATE = 0 UNCONNECTED_STATE = 0
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
from textwrap import dedent from textwrap import dedent
from _mysql_exceptions import OperationalError from MySQLdb import OperationalError
from Shared.DC.ZRDB.DA import DA from Shared.DC.ZRDB.DA import DA
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment