mirror of
https://github.com/psycopg/psycopg2.git
synced 2025-07-11 00:32:22 +03:00
Merge remote branch 'origin/python2' into python2
Conflicts: NEWS-2.3
This commit is contained in:
commit
9433a6879f
2
NEWS-2.3
2
NEWS-2.3
|
@ -15,6 +15,8 @@ What's new in psycopg 2.3.3
|
||||||
- Fixed several reference leaks in less common code paths.
|
- Fixed several reference leaks in less common code paths.
|
||||||
- Fixed segfault when a large object is closed and its connection no more
|
- Fixed segfault when a large object is closed and its connection no more
|
||||||
available.
|
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
|
What's new in psycopg 2.3.2
|
||||||
|
|
|
@ -194,7 +194,7 @@ __ac_permissions__ = (
|
||||||
|
|
||||||
# add icons
|
# 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',
|
for icon in ('table', 'view', 'stable', 'what', 'field', 'text', 'bin',
|
||||||
'int', 'float', 'date', 'time', 'datetime'):
|
'int', 'float', 'date', 'time', 'datetime'):
|
||||||
|
|
|
@ -26,4 +26,4 @@ def initialize(context):
|
||||||
permission = 'Add Z Psycopg 2 Database Connections',
|
permission = 'Add Z Psycopg 2 Database Connections',
|
||||||
constructors = (DA.manage_addZPsycopgConnectionForm,
|
constructors = (DA.manage_addZPsycopgConnectionForm,
|
||||||
DA.manage_addZPsycopgConnection),
|
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
BIN
ZPsycopgDA/icons/DBAdapterFolder_icon.gif
Executable file
Binary file not shown.
After Width: | Height: | Size: 897 B |
Loading…
Reference in New Issue
Block a user