Fix some missed s/self/typ/g substitutions in classemthods.

James William Pye · James William Pye · commit 79550afb6686 · 2009-02-01T16:30:44.000-07:00
. Remember to descend the PSs initialization transaction as well.
. Cleanup ife_snapshot_text on PSs
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -514,14 +514,15 @@ class Cursor(pg_api.Cursor):
 	_cursor_type = None
 
 	@classmethod
-	def from_query(type,
+	def from_query(
+		typ,
 		parameters, query,
 		with_hold = False,
 		with_scroll = False,
 		insensitive = True,
 		fetchcount = None,
 	):
-		c = super().__new__(type)
+		c = super().__new__(typ)
 		c.parameters = parameters
 		c.query = query
 		c.with_hold = with_hold
@@ -532,7 +533,7 @@ def from_query(type,
 		# If the cursor is not scrollable, and fetchcount
 		# was not supplied, set it as the default fetchcount.
 		if not with_scroll and fetchcount is None:
-			fetchcount = type.default_fetchcount
+			fetchcount = typ.default_fetchcount
 		c.__init__(ID(c), query.connection, fetchcount = fetchcount)
 		return c
 
@@ -948,15 +949,16 @@ class PreparedStatement(pg_api.PreparedStatement):
 	statement_id = None
 
 	@classmethod
-	def from_query_string(type,
+	def from_query_string(
+		typ,
 		string : "SQL statement to prepare",
 		connection : "connection to bind the query to",
 		statement_id : "statement_id to use instead of generating one" = None
 	) -> "PreparedStatement instance":
 		"""
 		Create a PreparedStatement from a query string.
 		"""
-		r = super().__new__(type)
+		r = super().__new__(typ)
 		r.string = string
 		r.__init__(statement_id or ID(r), connection)
 		return r
@@ -973,8 +975,8 @@ def __repr__(self):
 		return '<{mod}.{name}[{ci}] {state}>'.format(
 			mod = type(self).__module__,
 			name = type(self).__name__,
-			ci = ci,
-			state = self.closed and 'closed' or 'prepared',
+			ci = self.connection.connector._pq_iri,
+			state = self.state,
 		)
 
 	@property
@@ -991,6 +993,17 @@ def command(self) -> str:
 	def closed(self) -> bool:
 		return self._cid != self.connection._cid
 
+	@property
+	def state(self) -> str:
+		if self.closed:
+			if self._pq_xact is not None:
+				if self.string is not None:
+					return 'parsing'
+				else:
+					return 'describing'
+			return 'closed'
+		return 'prepared'
+
 	def close(self):
 		if self._cid == self.connection._cid:
 			self.connection._closestatements.append(self._pq_statement_id)
@@ -1010,11 +1023,10 @@ def prepare(self):
 
 	def ife_snapshot_text(self):
 		s = ""
-		if self.closed:
-			s += "[closed] "
-		if self.title:
-			s += self.title + ", "
-		s += "statement_id(" + repr(self._pq_statement_id or self.statement_id) + ")"
+		s += "[" + self.state + "] "
+		if self.ife_object_title != pg_api.InterfaceElement.ife_object_title:
+			s += self.ife_object_title + ", "
+		s += "statement_id(" + repr(self.statement_id) + ")"
 		s += os.linesep + ' ' * 2 + (os.linesep + ' ' * 2).join(
 			str(self.string).split(os.linesep)
 		)
@@ -1051,6 +1063,7 @@ def _init(self):
 			)
 		)
 		self._pq_xact = pq.Transaction(cmd)
+		self.ife_descend(self._pq_xact)
 		self.connection._pq_push(self._pq_xact)
 
 	def _fini(self):
diff --git a/postgresql/protocol/element3.py b/postgresql/protocol/element3.py
@@ -151,7 +151,7 @@ def serialize(self):
 	@classmethod
 	def parse(typ, data):
 		if data != b'':
-			raise ValueError("empty message(%r) had data" %(self.type,))
+			raise ValueError("empty message(%r) had data" %(typ.type,))
 		return typ.SingleInstance
 
 class Notify(Message):
@@ -321,7 +321,7 @@ def parse(typ, data):
 		kw = {}
 		for frag in data.split(b'\x00'):
 			if frag:
-				kw[self._dtm[frag[0:1]]] = frag[1:]
+				kw[typ._dtm[frag[0:1]]] = frag[1:]
 		return typ(**kw)
 
 class Error(Notice):
@@ -481,7 +481,7 @@ def bytes(self):
 
 	@classmethod
 	def parse(typ, data):
-		if data[0:4] != self.packed_version:
+		if data[0:4] != typ.packed_version:
 			raise ValueError("invalid cancel query code")
 		return typ(*unpack("!xxxxLL", data))
 
@@ -504,7 +504,7 @@ def serialize(self):
 
 	@classmethod
 	def parse(typ, data):
-		if data != self.packed_version:
+		if data != typ.packed_version:
 			raise ValueError("invalid SSL Negotiation code")
 		return NegotiateSSLMessage
 NegotiateSSLMessage = Message.__new__(NegotiateSSL)
@@ -532,7 +532,7 @@ def bytes(self):
 
 	@classmethod
 	def parse(typ, data):
-		if data[0:4] != self.version.bytes():
+		if data[0:4] != typ.packed_version:
 			raise ValueError("invalid version code {1}".format(repr(data[0:4])))
 		kw = dict()
 		key = None
