issue2551040: New release of psycopg2 drops support for psycopg1

First try at suport for psycopg2. Change .travis.yml to install newest
psycopg2 without psycopg1 support.

Author: rouilj

.travis.yml

@@ -67,7 +67,7 @@ before_install:
 
 install:
   - pip install mysqlclient==1.3.13
-  - pip install psycopg2==2.7.7
+  - pip install psycopg2
   - pip install gpg pytz whoosh
   - pip install pytest-cov codecov
 

CHANGES.txt

@@ -138,6 +138,8 @@ Fixed:
   code to make sure valid backend database is set. Remove config.ini
   from templates to make sure that roundup-admin install writes a new
   default config.ini based on configuration.py.
+- issue2551040: New release of psycopg2 drops support for psycopg1 -
+  need to rewrite. Now uses psycopg2 throughout. (John Rouillard)
 
 2018-07-13 1.6.0
 

roundup/backends/back_postgresql.py

@@ -4,7 +4,7 @@
 # under the same terms as Python, so long as this copyright message and
 # disclaimer are retained in their original form.
 #
-'''Postgresql backend via psycopg for Roundup.'''
+'''Postgresql backend via psycopg2 for Roundup.'''
 __docformat__ = 'restructuredtext'
 
 import os, shutil, time
@@ -13,13 +13,13 @@
 ISOLATION_LEVEL_REPEATABLE_READ = None
 ISOLATION_LEVEL_SERIALIZABLE = None
 
-from psycopg2 import psycopg1 as psycopg
+import psycopg2
 from psycopg2.extensions import QuotedString
 from psycopg2.extensions import ISOLATION_LEVEL_READ_UNCOMMITTED
 from psycopg2.extensions import ISOLATION_LEVEL_READ_COMMITTED
 from psycopg2.extensions import ISOLATION_LEVEL_REPEATABLE_READ
 from psycopg2.extensions import ISOLATION_LEVEL_SERIALIZABLE
-from psycopg2.psycopg1 import ProgrammingError
+from psycopg2 import ProgrammingError
 from psycopg2.extensions import TransactionRollbackError
 
 import logging
@@ -66,15 +66,15 @@ def db_command(config, command, database='postgres'):
     fail by conflicting with another user.
 
     Since PostgreSQL version 8.1 there is a database "postgres",
-    before "template1" seems to habe been used, so we fall back to it. 
+    before "template1" seems to have been used, so we fall back to it. 
     Compare to issue2550543.
     '''
     template1 = connection_dict(config)
     template1['database'] = database
 
     try:
-        conn = psycopg.connect(**template1)
-    except psycopg.OperationalError as message:
+        conn = psycopg2.connect(**template1)
+    except psycopg2.OperationalError as message:
         if str(message).find('database "postgres" does not exist') >= 0:
             return db_command(config, command, database='template1')
         raise hyperdb.DatabaseError(message)
@@ -97,7 +97,7 @@ def pg_command(cursor, command):
     '''
     try:
         cursor.execute(command)
-    except psycopg.DatabaseError as err:
+    except psycopg2.DatabaseError as err:
         response = str(err).split('\n')[0]
         if "FATAL" not in response :
             msgs = (
@@ -115,7 +115,7 @@ def db_exists(config):
     """Check if database already exists"""
     db = connection_dict(config, 'database')
     try:
-        conn = psycopg.connect(**db)
+        conn = psycopg2.connect(**db)
         conn.close()
         return 1
     except:
@@ -156,8 +156,8 @@ def sql_open_connection(self):
         logging.getLogger('roundup.hyperdb').info(
             'open database %r'%db['database'])
         try:
-            conn = psycopg.connect(**db)
-        except psycopg.OperationalError as message:
+            conn = psycopg2.connect(**db)
+        except psycopg2.OperationalError as message:
             raise hyperdb.DatabaseError(message)
 
         cursor = conn.cursor()
@@ -245,7 +245,7 @@ def __repr__(self):
         return '<roundpsycopgsql 0x%x>' % id(self)
 
     def sql_stringquote(self, value):
-        ''' psycopg.QuotedString returns a "buffer" object with the
+        ''' psycopg2.QuotedString returns a "buffer" object with the
             single-quotes around it... '''
         return str(QuotedString(str(value)))[1:-1]
 

test/test_postgresql.py

@@ -34,7 +34,7 @@
         reason='Skipping PostgreSQL tests: backend not available'))
 else:
     try:
-        from roundup.backends.back_postgresql import psycopg, db_command
+        from roundup.backends.back_postgresql import psycopg2, db_command
         db_command(config, 'select 1')
         skip_postgresql = lambda func, *args, **kwargs: func
     except( DatabaseError ) as msg:
@@ -110,7 +110,7 @@ def tearDown(self):
         try:
             self.db1.close()
             self.db2.close()
-        except psycopg.InterfaceError as exc:
+        except psycopg2.InterfaceError as exc:
             if 'connection already closed' in str(exc): pass
             else: raise
         ClassicInitBase.tearDown(self)