Commit 1cfeb9c3 authored by Arnaud Fontaine's avatar Arnaud Fontaine

py3: Update Shared.DC.ZRDB.{sqltest,sqlvar} monkey patches.

parent c6ed2568
...@@ -10,6 +10,13 @@ ...@@ -10,6 +10,13 @@
# FOR A PARTICULAR PURPOSE # FOR A PARTICULAR PURPOSE
# #
############################################################################## ##############################################################################
try:
from Shared.DC.ZRDB.sqlvar import StringTypes
except ImportError: # Products.ZSQLMethods < 3.0.8
import six
StringTypes = six.string_types + (six.binary_type,)
from Shared.DC.ZRDB.sqltest import * from Shared.DC.ZRDB.sqltest import *
from Shared.DC.ZRDB import sqltest from Shared.DC.ZRDB import sqltest
from DateTime import DateTime from DateTime import DateTime
......
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
# #
############################################################################## ##############################################################################
try:
from Shared.DC.ZRDB.sqlvar import StringTypes
except ImportError: # Products.ZSQLMethods < 3.0.8
import six
StringTypes = six.string_types + (six.binary_type,)
# dtml-sqlvar patch to convert None to NULL, and deal with DateTime # dtml-sqlvar patch to convert None to NULL, and deal with DateTime
from Shared.DC.ZRDB.sqlvar import * from Shared.DC.ZRDB.sqlvar import *
......
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