DA version patch.

This commit is contained in:
Federico Di Gregorio 2007-12-21 00:45:01 +00:00
parent d31b4add22
commit f3e74d2c48
3 changed files with 15 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2007-12-21 Federico Di Gregorio <fog@initd.org>
* Applied win32 patch from Jason Erickson.
* Applied patch from Thomas Lotze to use correct version
for new Zopes.
2007-12-20 James Henstridge <james@jamesh.id.au> 2007-12-20 James Henstridge <james@jamesh.id.au>
* psycopg/pqpath.c (pq_execute): uncomment the "curs->pgres == * psycopg/pqpath.c (pq_execute): uncomment the "curs->pgres ==

View File

@ -37,10 +37,13 @@ from DateTime import DateTime
# Build Zope version in a float for later cheks # Build Zope version in a float for later cheks
import App import App
zope_version = App.version_txt.getZopeVersion() zope_version = App.version_txt.getZopeVersion()
zope_version = float("%s.%s" %(zope_version[:2])) if zope_version[1] == -1:
zope_version = None
else:
zope_version = float("%s.%s" %(zope_version[:2]))
# ImageFile is deprecated in Zope >= 2.9 # ImageFile is deprecated in Zope >= 2.9
if zope_version < 2.9: if zope_version is not None and zope_version < 2.9:
from ImageFile import ImageFile from ImageFile import ImageFile
else: else:
from App.ImageFile import ImageFile from App.ImageFile import ImageFile

View File

@ -130,6 +130,9 @@
<File name="./tests/test_psycopg2_dbapi20.py" subtype="Code" buildaction="Nothing" /> <File name="./tests/test_psycopg2_dbapi20.py" subtype="Code" buildaction="Nothing" />
<File name="./tests/test_transaction.py" subtype="Code" buildaction="Nothing" /> <File name="./tests/test_transaction.py" subtype="Code" buildaction="Nothing" />
<File name="./tests/types_basic.py" subtype="Code" buildaction="Nothing" /> <File name="./tests/types_basic.py" subtype="Code" buildaction="Nothing" />
<File name="./tests/bugX000.py" subtype="Code" buildaction="Nothing" />
<File name="./tests/Makefile" subtype="Code" buildaction="Nothing" />
<File name="./tests/runtests.py" subtype="Code" buildaction="Nothing" />
</Contents> </Contents>
<compiler ctype="GccCompiler" /> <compiler ctype="GccCompiler" />
<MonoDevelop.ChangeLogAddIn.ChangeLogInfo policy="UpdateNearestChangeLog" /> <MonoDevelop.ChangeLogAddIn.ChangeLogInfo policy="UpdateNearestChangeLog" />