update for latest version of psycopg2 (patch-ish [SF#429391])

Author: Richard Jones

CHANGES.txt

@@ -12,13 +12,15 @@ Feature:
 - include the popcal in Date field editing and search fields by default
 - @required in forms may now specify properties of linked items (sf patch
   1507093)
+- update for latest version of pysqlite (sf bug 1487098; patch 1534227)
+- update for latest version of psycopg2 (sf patch 1429391)
+
 
 Fixed:
 - Verbose option for import and export (sf bug 1505645)
 - -c option for roundup-mailgw won't accept parameter (sf bug 1505649)
 - '?' in rfc2822-encoded header isn't quoted (sf bug 1505663)
 - fix error message in form parser
-- update for latest version of pysqlite (sf bug 1487098; patch 1534227)
 - updated ZRoundup for Zope 2.9 (sf patch 1511734)
 - fix timelog example in customisation doc to mention permissions
 - nicer listing of Superseder links (sf non-patch 1497767)

roundup/backends/back_postgresql.py

@@ -1,4 +1,4 @@
-#$Id: back_postgresql.py,v 1.31 2006-01-20 02:27:12 richard Exp $
+#$Id: back_postgresql.py,v 1.32 2006-08-11 00:44:00 richard Exp $
 #
 # Copyright (c) 2003 Martynas Sklyzmantas, Andrey Lebedev <[email protected]>
 #
@@ -10,7 +10,10 @@
 __docformat__ = 'restructuredtext'
 
 import os, shutil, popen2, time
-import psycopg
+try:
+    import psycopg
+except:
+    import psycopg2 as psycopg
 import logging
 
 from roundup import hyperdb, date