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

Merge branch 'python2' into python3

Browse Source
This commit is contained in:
Daniele Varrazzo 2011-02-01 02:27:45 +00:00
commit d40b394c50
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS-2.3
View File

@ -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

2
ZPsycopgDA/DA.py
View File

@ -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'):

2
ZPsycopgDA/__init__.py
View File

@ -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')

BIN
ZPsycopgDA/icons/DBAdapterFolder_icon.gif Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 897 B

2
psycopg/adapter_datetime.c
View File

@ -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;