Fix a resource warning caused by a forgotten socket.

James William Pye · James William Pye · commit e4fc3db6c58d · 2011-09-14T18:33:14.000-05:00
The common situation occurred when connecting to 'localhost' where the addrinfo
returns IPv6 addresses that aren't fully functional or in use.
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -2441,6 +2441,10 @@ def _establish(self):
 						self._receive_async(x)
 				# success!
 				break
+			elif pq.socket is not None:
+				# In this case, an application/protocol error occurred.
+				# Close out the sockets ourselves.
+				pq.socket.close()
 
 			if sslmode == 'prefer' and ssl is False and didssl is False:
 				# In this case, the server doesn't support SSL or it's
@@ -2640,6 +2644,7 @@ def __init__(self, connector, *args, **kw):
 		self.connector = connector
 		# raw notify messages
 		self._notifies = []
+		self.fileno = -1
 		self.typio = self.connector.driver.typio(self)
 		self.typio.set_encoding('ascii')
 		self.settings = Settings(self)
diff --git a/postgresql/protocol/client3.py b/postgresql/protocol/client3.py
@@ -155,60 +155,51 @@ def connect(self, ssl = None, timeout = None):
 				))
 			return
 
-		try:
-			if ssl is not None:
-				# if ssl is True, ssl is *required*
-				# if ssl is False, ssl will be tried, but not required
-				# if ssl is None, no SSL negotiation will happen
-				self.ssl_negotiation = supported = self.negotiate_ssl()
-
-				# b'S' or b'N' was *not* received.
-				if supported is None:
-					# probably not PQv3..
-					self.socket.close()
-					self.xact.fatal = True
-					self.xact.error_message = not_pq_error
-					self.xact.state = xact.Complete
-					return
+		if ssl is not None:
+			# if ssl is True, ssl is *required*
+			# if ssl is False, ssl will be tried, but not required
+			# if ssl is None, no SSL negotiation will happen
+			self.ssl_negotiation = supported = self.negotiate_ssl()
+
+			# b'S' or b'N' was *not* received.
+			if supported is None:
+				# probably not PQv3..
+				self.xact.fatal = True
+				self.xact.error_message = not_pq_error
+				self.xact.state = xact.Complete
+				return
 
-				# b'N' was received, but ssl is required.
-				if not supported and ssl is True:
-					# ssl is required..
-					self.socket.close()
+			# b'N' was received, but ssl is required.
+			if not supported and ssl is True:
+				# ssl is required..
+				self.xact.fatal = True
+				self.xact.error_message = no_ssl_error
+				self.xact.state = xact.Complete
+				return
+
+			if supported:
+				# Make an SSL connection.
+				try:
+					self.socket = self.socket_factory.secure(self.socket)
+				except Exception as err:
+					# Any exception marks a failure.
+					self.xact.exception = err
 					self.xact.fatal = True
-					self.xact.error_message = no_ssl_error
 					self.xact.state = xact.Complete
+					self.xact.error_message = ssl_failed_error
 					return
-
-				if supported:
-					# Make an SSL connection.
-					try:
-						self.socket = self.socket_factory.secure(self.socket)
-					except Exception as err:
-						# Any exception marks a failure.
-						self.socket.close()
-						self.xact.exception = err
-						self.xact.fatal = True
-						self.xact.state = xact.Complete
-						self.xact.error_message = ssl_failed_error
-						return
-			# time to negotiate
-			negxact = self.xact
-			self.complete()
-			if negxact.state is xact.Complete and negxact.fatal is None:
-				self.key = negxact.killinfo.key
-				self.backend_id = negxact.killinfo.pid
-			elif not hasattr(self.xact, 'error_message'):
-				# if it's not complete, something strange happened.
-				# make sure to clean up...
-				self.socket.close()
-				self.xact.fatal = True
-				self.xact.state = xact.Complete
-				self.xact.error_message = partial_connection_error
-		except:
-			if self.socket is not None:
-				self.socket.close()
-			raise
+		# time to negotiate
+		negxact = self.xact
+		self.complete()
+		if negxact.state is xact.Complete and negxact.fatal is None:
+			self.key = negxact.killinfo.key
+			self.backend_id = negxact.killinfo.pid
+		elif not hasattr(self.xact, 'error_message'):
+			# if it's not complete, something strange happened.
+			# make sure to clean up...
+			self.xact.fatal = True
+			self.xact.state = xact.Complete
+			self.xact.error_message = partial_connection_error
 
 	def negotiate_ssl(self) -> (bool, None):
 		"""
diff --git a/postgresql/python/socket.py b/postgresql/python/socket.py
@@ -66,7 +66,7 @@ def __call__(self, timeout = None):
 			s.settimeout(float(timeout) if timeout is not None else None)
 			s.connect(self.socket_connect)
 			s.settimeout(None)
-		except Exception:
+		except:
 			s.close()
 			raise
 		return s
