Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
erp5
Commits
a7752d21
Commit
a7752d21
authored
Jul 02, 2020
by
Kazuhiko
Committed by
Kazuhiko Shiozaki
Jan 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZMySQLDA etc.: support mysqlclient >= 1.4.0.
parent
2cb0b714
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
8 deletions
+7
-8
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Catalog.py
...mplateItem/portal_components/test.erp5.testERP5Catalog.py
+1
-1
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testIdTool.py
...estTemplateItem/portal_components/test.erp5.testIdTool.py
+1
-1
product/CMFActivity/tests/testCMFActivity.py
product/CMFActivity/tests/testCMFActivity.py
+1
-1
product/ERP5/Document/SQLNonContinuousIncreasingIdGenerator.py
...ct/ERP5/Document/SQLNonContinuousIncreasingIdGenerator.py
+1
-1
product/ZMySQLDA/db.py
product/ZMySQLDA/db.py
+1
-2
product/ZMySQLDA/tests/testDeferredConnection.py
product/ZMySQLDA/tests/testDeferredConnection.py
+1
-1
product/ZMySQLDA/tests/testTableStructureMigration.py
product/ZMySQLDA/tests/testTableStructureMigration.py
+1
-1
No files found.
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Catalog.py
View file @
a7752d21
...
@@ -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
...
...
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testIdTool.py
View file @
a7752d21
...
@@ -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
):
...
...
product/CMFActivity/tests/testCMFActivity.py
View file @
a7752d21
...
@@ -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
...
...
product/ERP5/Document/SQLNonContinuousIncreasingIdGenerator.py
View file @
a7752d21
...
@@ -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
...
...
product/ZMySQLDA/db.py
View file @
a7752d21
...
@@ -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
)
...
...
product/ZMySQLDA/tests/testDeferredConnection.py
View file @
a7752d21
...
@@ -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
...
...
product/ZMySQLDA/tests/testTableStructureMigration.py
View file @
a7752d21
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment