Fix compatibility with Zope 2.12.9

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37093 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8d8e1075
...@@ -90,7 +90,8 @@ __version__='$Revision: 1.4 $'[11:-2] ...@@ -90,7 +90,8 @@ __version__='$Revision: 1.4 $'[11:-2]
import os import os
from db import ThreadedDB from db import ThreadedDB
import Shared.DC.ZRDB.Connection, sys, DABase import Shared.DC.ZRDB
import DABase
from App.Dialogs import MessageDialog from App.Dialogs import MessageDialog
from App.special_dtml import HTMLFile from App.special_dtml import HTMLFile
from App.ImageFile import ImageFile from App.ImageFile import ImageFile
...@@ -99,6 +100,8 @@ from DateTime import DateTime ...@@ -99,6 +100,8 @@ from DateTime import DateTime
from thread import allocate_lock from thread import allocate_lock
from Acquisition import aq_parent from Acquisition import aq_parent
SHARED_DC_ZRDB_LOCATION = os.path.dirname(Shared.DC.ZRDB.__file__)
manage_addZMySQLConnectionForm=HTMLFile('connectionAdd',globals()) manage_addZMySQLConnectionForm=HTMLFile('connectionAdd',globals())
def manage_addZMySQLConnection(self, id, title, def manage_addZMySQLConnection(self, id, title,
...@@ -177,7 +180,7 @@ __ac_permissions__=( ...@@ -177,7 +180,7 @@ __ac_permissions__=(
) )
misc_={'conn': ImageFile( misc_={'conn': ImageFile(
os.path.join('Shared','DC','ZRDB','www','DBAdapterFolder_icon.gif'))} os.path.join(SHARED_DC_ZRDB_LOCATION,'www','DBAdapterFolder_icon.gif'))}
for icon in ('table', 'view', 'stable', 'what', for icon in ('table', 'view', 'stable', 'what',
'field', 'text','bin','int','float', 'field', 'text','bin','int','float',
......
...@@ -85,9 +85,10 @@ ...@@ -85,9 +85,10 @@
############################################################################## ##############################################################################
database_type='MySQL' database_type='MySQL'
import os import os.path
from db import ThreadedDeferredDB from db import ThreadedDeferredDB
import Shared.DC.ZRDB.Connection, sys, DABase import Shared.DC.ZRDB
import DABase
from App.Dialogs import MessageDialog from App.Dialogs import MessageDialog
from App.special_dtml import HTMLFile from App.special_dtml import HTMLFile
from App.ImageFile import ImageFile from App.ImageFile import ImageFile
...@@ -95,6 +96,8 @@ from ExtensionClass import Base ...@@ -95,6 +96,8 @@ from ExtensionClass import Base
from DateTime import DateTime from DateTime import DateTime
from thread import allocate_lock from thread import allocate_lock
SHARED_DC_ZRDB_LOCATION = os.path.dirname(Shared.DC.ZRDB.__file__)
manage_addZMySQLDeferredConnectionForm=HTMLFile('deferredConnectionAdd',globals()) manage_addZMySQLDeferredConnectionForm=HTMLFile('deferredConnectionAdd',globals())
def manage_addZMySQLDeferredConnection(self, id, title, def manage_addZMySQLDeferredConnection(self, id, title,
...@@ -170,7 +173,7 @@ __ac_permissions__=( ...@@ -170,7 +173,7 @@ __ac_permissions__=(
) )
misc_={'conn': ImageFile( misc_={'conn': ImageFile(
os.path.join('Shared','DC','ZRDB','www','DBAdapterFolder_icon.gif'))} os.path.join(SHARED_DC_ZRDB_LOCATION,'www','DBAdapterFolder_icon.gif'))}
for icon in ('table', 'view', 'stable', 'what', for icon in ('table', 'view', 'stable', 'what',
'field', 'text','bin','int','float', 'field', 'text','bin','int','float',
......
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