diff options
| author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-02-01 02:27:45 +0000 |
|---|---|---|
| committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-02-01 02:27:45 +0000 |
| commit | d40b394c507fb3db49f659c57741cdfe09bb9d39 (patch) | |
| tree | 66c618ecabe5a57604451bfd0791543583cd1251 | |
| parent | bde443a90293c5f18b72b100a21940b102ca784b (diff) | |
| parent | 9433a6879f9e012090d48a9bb3145c3b8e6ae25a (diff) | |
| download | psycopg2-d40b394c507fb3db49f659c57741cdfe09bb9d39.tar.gz | |
Merge branch 'python2' into python3
| -rw-r--r-- | NEWS-2.3 | 2 | ||||
| -rw-r--r-- | ZPsycopgDA/DA.py | 2 | ||||
| -rw-r--r-- | ZPsycopgDA/__init__.py | 2 | ||||
| -rwxr-xr-x | ZPsycopgDA/icons/DBAdapterFolder_icon.gif | bin | 0 -> 897 bytes | |||
| -rw-r--r-- | psycopg/adapter_datetime.c | 2 |
5 files changed, 5 insertions, 3 deletions
@@ -23,6 +23,8 @@ What's new in psycopg 2.3.3 - Fixed several reference leaks in less common code paths. - Fixed segfault when a large object is closed and its connection no more available. + - Added missing icon to ZPsycopgDA package, not available in Zope 2.12.9 + (ticket #30). Bug report and patch by Pumukel. What's new in psycopg 2.3.2 diff --git a/ZPsycopgDA/DA.py b/ZPsycopgDA/DA.py index d88766e..735bc4b 100644 --- a/ZPsycopgDA/DA.py +++ b/ZPsycopgDA/DA.py @@ -194,7 +194,7 @@ __ac_permissions__ = ( # add icons -misc_={'conn': ImageFile('Shared/DC/ZRDB/www/DBAdapterFolder_icon.gif')} +misc_={'conn': ImageFile('icons/DBAdapterFolder_icon.gif', globals())} for icon in ('table', 'view', 'stable', 'what', 'field', 'text', 'bin', 'int', 'float', 'date', 'time', 'datetime'): diff --git a/ZPsycopgDA/__init__.py b/ZPsycopgDA/__init__.py index f26d368..118c4fe 100644 --- a/ZPsycopgDA/__init__.py +++ b/ZPsycopgDA/__init__.py @@ -26,4 +26,4 @@ def initialize(context): permission = 'Add Z Psycopg 2 Database Connections', constructors = (DA.manage_addZPsycopgConnectionForm, DA.manage_addZPsycopgConnection), - icon = SOFTWARE_HOME + '/Shared/DC/ZRDB/www/DBAdapterFolder_icon.gif') + icon = 'icons/DBAdapterFolder_icon.gif') diff --git a/ZPsycopgDA/icons/DBAdapterFolder_icon.gif b/ZPsycopgDA/icons/DBAdapterFolder_icon.gif Binary files differnew file mode 100755 index 0000000..ced0ef2 --- /dev/null +++ b/ZPsycopgDA/icons/DBAdapterFolder_icon.gif diff --git a/psycopg/adapter_datetime.c b/psycopg/adapter_datetime.c index c1a976e..5850be8 100644 --- a/psycopg/adapter_datetime.c +++ b/psycopg/adapter_datetime.c @@ -401,7 +401,7 @@ psyco_Timestamp(PyObject *self, PyObject *args) int hour=0, minute=0; /* default to midnight */ double second=0.0; - if (!PyArg_ParseTuple(args, "lii|iidO", &year, &month, &day, + if (!PyArg_ParseTuple(args, "iii|iidO", &year, &month, &day, &hour, &minute, &second, &tzinfo)) return NULL; |
