Hold the DB-API 2.0 exception change until 1.3 for fear of breaking offline dependencies and add a test checking for desired behaviour.

jwp · jwp · commit 3f7bc2c3b6fd · 2020-09-22T11:40:21.000-07:00
diff --git a/README b/README
@@ -15,7 +15,7 @@ Errata
 ------
 
 .. warning::
-	`postgresql.driver.dbapi20.connect` will now raise `ClientCannotConnectError` directly.
+	In v1.3, `postgresql.driver.dbapi20.connect` will now raise `ClientCannotConnectError` directly.
 	Exception traps around connect should still function, but the `__context__` attribute
 	on the error instance will be `None` in the usual failure case as it is no longer
 	incorrectly chained. Trapping `ClientCannotConnectError` ahead of `Error` should
diff --git a/postgresql/driver/dbapi20.py b/postgresql/driver/dbapi20.py
@@ -323,6 +323,9 @@ class Connection(Connection):
 		Warning
 	DatabaseError = DatabaseError
 	NotSupportedError = NotSupportedError
+
+	# Explicitly manage DB-API connected state to properly
+	# throw the already closed error. This will be active in 1.3.
 	_dbapi_connected_flag = False
 
 	def autocommit_set(self, val):
@@ -358,7 +361,7 @@ def connect(self, *args, **kw):
 		self._dbapi_connected_flag = True
 
 	def close(self):
-		if self.closed and self._dbapi_connected_flag:
+		if self.closed:# and self._dbapi_connected_flag:
 			raise Error(
 				"connection already closed",
 				source = 'CLIENT',
diff --git a/postgresql/release/distutils.py b/postgresql/release/distutils.py
@@ -20,7 +20,7 @@
 
 LONG_DESCRIPTION = """
 .. warning::
-	`postgresql.driver.dbapi20.connect` will now raise `ClientCannotConnectError` directly.
+	In v1.3, `postgresql.driver.dbapi20.connect` will now raise `ClientCannotConnectError` directly.
 	Exception traps around connect should still function, but the `__context__` attribute
 	on the error instance will be `None` in the usual failure case as it is no longer
 	incorrectly chained. Trapping `ClientCannotConnectError` ahead of `Error` should
diff --git a/postgresql/test/test_connect.py b/postgresql/test/test_connect.py
@@ -410,6 +410,17 @@ def test_dbapi_connect(self):
 			TRUST.cursor().execute, 'select 1'
 		)
 
+	def test_dbapi_connect_failure(self):
+		host, port = self.cluster.address()
+		badlogin = (lambda: dbapi20.connect(
+			user = '--',
+			database = '--',
+			password = '...',
+			host = host, port = port,
+			**self.params
+		))
+		self.assertRaises(pg_exc.ClientCannotConnectError, badlogin)
+
 	def test_IP4_connect(self):
 		C = pg_driver.default.ip4(
 			user = 'test',
