diff options
| author | Federico Di Gregorio <fog@initd.org> | 2007-12-21 00:45:01 +0000 |
|---|---|---|
| committer | Federico Di Gregorio <fog@initd.org> | 2007-12-21 00:45:01 +0000 |
| commit | f3e74d2c4892499a62264a733924e849c10e343e (patch) | |
| tree | e97fa054eb389b31374249d731abadcf19d59264 | |
| parent | d31b4add22debc3f9f691bb7aee8aae0a774a656 (diff) | |
| download | psycopg2-f3e74d2c4892499a62264a733924e849c10e343e.tar.gz | |
DA version patch.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ZPsycopgDA/DA.py | 7 | ||||
| -rw-r--r-- | psycopg2.mdp | 3 |
3 files changed, 15 insertions, 2 deletions
@@ -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> * psycopg/pqpath.c (pq_execute): uncomment the "curs->pgres == diff --git a/ZPsycopgDA/DA.py b/ZPsycopgDA/DA.py index 9a24dba..04ea6ce 100644 --- a/ZPsycopgDA/DA.py +++ b/ZPsycopgDA/DA.py @@ -37,10 +37,13 @@ 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])) +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 < 2.9: +if zope_version is not None and zope_version < 2.9: from ImageFile import ImageFile else: from App.ImageFile import ImageFile diff --git a/psycopg2.mdp b/psycopg2.mdp index dfb98c5..4c562f5 100644 --- a/psycopg2.mdp +++ b/psycopg2.mdp @@ -130,6 +130,9 @@ <File name="./tests/test_psycopg2_dbapi20.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/bugX000.py" subtype="Code" buildaction="Nothing" /> + <File name="./tests/Makefile" subtype="Code" buildaction="Nothing" /> + <File name="./tests/runtests.py" subtype="Code" buildaction="Nothing" /> </Contents> <compiler ctype="GccCompiler" /> <MonoDevelop.ChangeLogAddIn.ChangeLogInfo policy="UpdateNearestChangeLog" /> |