Minor changes.

James William Pye · James William Pye · commit 787918ae359b · 2010-02-17T03:19:33.000-07:00
Localize xact and Complete.
diff --git a/postgresql/protocol/client3.py b/postgresql/protocol/client3.py
@@ -226,14 +226,15 @@ def negotiate_ssl(self) -> (bool, None):
 		# probably not postgresql.
 		return None
 
-	def read_into(self):
+	def read_into(self, Complete = xact.Complete):
 		"""
 		read data from the wire and write it into the message buffer.
 		"""
 		BUFFER_HAS_MSG = self.message_buffer.has_message
 		BUFFER_WRITE_MSG = self.message_buffer.write
 		RECV_DATA = self.socket.recv
 		RECV_BYTES = self.recvsize
+		XACT = self.xact
 		while not BUFFER_HAS_MSG():
 			if self.read_data is not None:
 				BUFFER_WRITE_MSG(self.read_data)
@@ -247,10 +248,10 @@ def read_into(self):
 				msg = self.socket_factory.fatal_exception_message(e)
 				if msg is not None:
 					self.socket.close()
-					self.xact.state = xact.Complete
-					self.xact.fatal = True
-					self.xact.exception = e
-					self.xact.error_message = element.ClientError((
+					XACT.state = Complete
+					XACT.fatal = True
+					XACT.exception = e
+					XACT.error_message = element.ClientError((
 						(b'S', 'FATAL'),
 						(b'C', '08006'),
 						(b'M', msg),
@@ -265,9 +266,9 @@ def read_into(self):
 			# nothing read from a blocking socket? it's over.
 			if self.read_data == b'':
 				self.socket.close()
-				self.xact.state = xact.Complete
-				self.xact.fatal = True
-				self.xact.error_message = eof_error
+				XACT.state = Complete
+				XACT.fatal = True
+				XACT.error_message = eof_error
 				return False
 
 			# Got data. Put it in the buffer and clear read_data.
