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

(App.ImageFile): simplify ImageFile import using patch from

Browse Source 
chrism, fixing bug #198.
This commit is contained in:
James Henstridge 2008-01-16 23:16:59 +00:00
parent 6d9b6a977c
commit abb0a6f52c
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* ZPsycopgDA/DA.py (Connection.__init__): Default the encoding to
UTF-8, fixing bug #190.
(App.ImageFile): simplify ImageFile import using patch from
chrism, fixing bug #198.
2008-01-16 James Henstridge <james@jamesh.id.au>

18
ZPsycopgDA/DA.py
View File

@ -34,19 +34,13 @@ from ExtensionClass import Base
from App.Dialogs import MessageDialog
from DateTime import DateTime
# Build Zope version in a float for later cheks
import App
zope_version = App.version_txt.getZopeVersion()
if zope_version[1] == -1:
zope_version = None
else:
zope_version = float("%s.%s" %(zope_version[:2]))
# ImageFile is deprecated in Zope >= 2.9
if zope_version is not None and zope_version < 2.9:
from ImageFile import ImageFile
else:
from App.ImageFile import ImageFile
try:
from App.ImageFile import ImageFile
except ImportError:
# Zope < 2.9. If PIL's installed with a .pth file, we're probably
# hosed.
from ImageFile import ImageFile
# import psycopg and functions/singletons needed for date/time conversions