psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-29 12:23:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

ImageFile patch from Charlie.

Browse Source
This commit is contained in:
Federico Di Gregorio 2006-09-01 07:19:22 +00:00
parent 38cf5f4520
commit ba1e5389c8
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-09-01 Federico Di Gregorio <fog@initd.org> 2006-09-01 Federico Di Gregorio <fog@initd.org>
* ZPsycopgDA/DA.py: applied ImageFile patch from Charlie
Clark.
* lib/pool.py: applied logging patch from Charlie Clark. * lib/pool.py: applied logging patch from Charlie Clark.
It will probably get a makeup and be moved to the top-level It will probably get a makeup and be moved to the top-level
module later. module later.

12
ZPsycopgDA/DA.py
View File

@ -30,11 +30,21 @@ import Shared.DC.ZRDB.Connection
from db import DB from db import DB
from Globals import HTMLFile from Globals import HTMLFile
from ImageFile import ImageFile
from ExtensionClass import Base from ExtensionClass import Base
from App.Dialogs import MessageDialog from App.Dialogs import MessageDialog
from DateTime import DateTime from DateTime import DateTime
# Build Zope version in a float for later cheks
import App
zope_version = App.version_txt.getZopeVersion()
zope_version = float("%s.%s" %(zope_version[:2]))
# ImageFile is deprecated in Zope >= 2.9
if zope_version < 2.9:
from ImageFile import ImageFile
else:
from App.ImageFile import ImageFile
# import psycopg and functions/singletons needed for date/time conversions # import psycopg and functions/singletons needed for date/time conversions
import psycopg2 import psycopg2