From d0e36d194cdb3f04cb685e8a0a43a84d9069dbf1 Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 14 Jan 2011 01:18:05 +0000
Subject: [PATCH 1/2] Added icon removed from Zope 2.12.9 to the ZPsycopgDA
 package

Closes ticket #30. Bug report and patch by Pumukel.
---
 NEWS-2.3                                  |   7 +++++++
 ZPsycopgDA/DA.py                          |   2 +-
 ZPsycopgDA/__init__.py                    |   2 +-
 ZPsycopgDA/icons/DBAdapterFolder_icon.gif | Bin 0 -> 897 bytes
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100755 ZPsycopgDA/icons/DBAdapterFolder_icon.gif

diff --git a/NEWS-2.3 b/NEWS-2.3
index 179ab299..0fcc197e 100644
--- a/NEWS-2.3
+++ b/NEWS-2.3
@@ -1,3 +1,10 @@
+What's new in psycopg 2.3.3
+---------------------------
+
+  - 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 d88766ef..735bc4b3 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 f26d368e..118c4fe7 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
new file mode 100755
index 0000000000000000000000000000000000000000..ced0ef26a54d7150fe6f0589e561f8854eb2960a
GIT binary patch
literal 897
zcmZ?wbhEHb6krfw_|Cxa9|##30s;aW8X689H~{1{FgP$UEMRbGXkch?U~u>kRPi6k
zYyb-U2XaQiXb23W5K#Qd!U*z?4u}Bd2?mZh21X7Ui3JM|HgfP<MV$Dcz`!J+ER^73
zc)+<+fZ4>xL&3qNpUqTn%Z-o8?p@0ARc9)MR6Toiwc~VV3NCG)Zjx*^M>BAV4}+rU
bE|C|PpZP6tYZubZxUA^3z)_Hmg~1vCl&?8A

literal 0
HcmV?d00001


From a2dcf504b59bde5a7ffe0eefa875f24fe5602d0f Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Tue, 1 Feb 2011 02:00:47 +0000
Subject: [PATCH 2/2] Hopefully really fixed crash in datetime adapter.

Verified with gcc 4.3. Notice that on gcc 4.4 the bug was not present.
---
 psycopg/adapter_datetime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/psycopg/adapter_datetime.c b/psycopg/adapter_datetime.c
index 0ceb7033..fe7acc8e 100644
--- a/psycopg/adapter_datetime.c
+++ b/psycopg/adapter_datetime.c
@@ -387,7 +387,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;