Refer to local binds in functions and module attributes in module bodies.

jwp · jwp · commit 33cb09d2ea4c · 2015-07-23T10:05:14.000-07:00
(Optimize the function a bit)
diff --git a/postgresql/alock.py b/postgresql/alock.py
@@ -4,16 +4,16 @@
 """
 Tools for Advisory Locks
 """
-from abc import abstractmethod, abstractproperty
-from .python.element import Element
+import abc
+from .python import element
 
 __all__ = [
 	'ALock',
 	'ExclusiveLock',
 	'ShareLock',
 ]
 
-class ALock(Element):
+class ALock(element.Element):
 	"""
 	Advisory Lock class for managing the acquisition and release of a sequence
 	of PostgreSQL advisory locks.
@@ -32,13 +32,13 @@ def _e_metas(self,
 	):
 		yield None, headfmt(self.state, self.mode)
 
-	@abstractproperty
+	@abc.abstractproperty
 	def mode(self):
 		"""
 		The mode of the lock class.
 		"""
 
-	@abstractproperty
+	@abc.abstractproperty
 	def __select_statements__(self):
 		"""
 		Implemented by subclasses to return the statements to try, acquire, and
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -1775,11 +1775,17 @@ def _load_copy_chunks(self, chunks, *parameters):
 	def _load_tuple_chunks(self, chunks):
 		pte = self._raise_parameter_tuple_error
 		last = (element.SynchronizeMessage,)
+
+		Bind = element.Bind
+		Instruction = xact.Instruction
+		Execute = element.Execute
+		tuple = tuple
+
 		try:
 			for chunk in chunks:
 				bindings = [
 					(
-						element.Bind(
+						Bind(
 							b'',
 							self._pq_statement_id,
 							self._input_formats,
@@ -1788,13 +1794,13 @@ def _load_tuple_chunks(self, chunks):
 							),
 							(),
 						),
-						element.Execute(b'', 1),
+						Execute(b'', 1),
 					)
 					for t in chunk
 				]
 				bindings.append(last)
 				self.database._pq_push(
-					xact.Instruction(
+					Instruction(
 						chain.from_iterable(bindings),
 						asynchook = self.database._receive_async
 					),
@@ -2429,7 +2435,7 @@ def _establish(self):
 		# guts of connect()
 		self.pq = None
 		# if any exception occurs past this point, the connection
-		# will not be usable.
+		# object will not be usable.
 		timeout = self.connector.connect_timeout
 		sslmode = self.connector.sslmode or 'prefer'
 		failures = []
diff --git a/postgresql/pgpassfile.py b/postgresql/pgpassfile.py
@@ -2,7 +2,7 @@
 # .pgpassfile - parse and lookup passwords in a pgpassfile
 ##
 'Parse pgpass files and subsequently lookup a password.'
-from os.path import exists
+import os.path
 
 def split(line, len = len):
 	line = line.strip()
@@ -54,7 +54,7 @@ def lookup_password_file(path, t):
 	with open(path) as f:
 		return lookup_password(parse(f), t)
 
-def lookup_pgpass(d, passfile, exists = exists):
+def lookup_pgpass(d, passfile, exists = os.path.exists):
 	# If the password file exists, lookup the password
 	# using the config's criteria.
 	if exists(passfile):
