Allow prompt_title to be given on open() and dbapi.connect()

James William Pye · James William Pye · commit 11d3bacef4ba · 2009-06-05T12:06:48.000-07:00
diff --git a/postgresql/__init__.py b/postgresql/__init__.py
@@ -32,7 +32,7 @@
 )
 
 pg_iri = pg_driver = pg_param = None
-def open(iri = None, **kw):
+def open(iri = None, prompt_title = None, **kw):
 	"""
 	Create a `postgresql.api.Connection` to the server referenced by the given
 	`iri`::
@@ -44,9 +44,6 @@ def open(iri = None, **kw):
 		# Connect to 'postgres' at localhost.
 		>>> db = postgresql.open('localhost/postgres')
 
-	If the URL starts with an '&', a connector will be returned instead of a
-	connection.
-
 	(Note: "pq" is the name of the protocol used to communicate with PostgreSQL)
 	"""
 	global pg_iri, pg_driver, pg_param
@@ -72,7 +69,7 @@ def open(iri = None, **kw):
 		list(pg_param.denormalize_parameters(kw))
 	)
 	# Resolve the password, but never prompt.
-	pg_param.resolve_password(params, prompt_title = None)
+	pg_param.resolve_password(params, prompt_title = prompt_title)
 
 	C = pg_driver.default.fit(**params)
 	if return_connector is True:
diff --git a/postgresql/driver/dbapi20.py b/postgresql/driver/dbapi20.py
@@ -375,7 +375,7 @@ def rollback(self):
 		self._xact.start()
 
 driver = pg_driver.Driver(connection = Connection)
-def connect(**kw):
+def connect(prompt_title = None, **kw):
 	"""
 	Create a DB-API connection using the given parameters.
 	"""
@@ -385,5 +385,5 @@ def connect(**kw):
 		list(pg_param.denormalize_parameters(kw))
 	)
 	# Resolve the password, but never prompt.
-	pg_param.resolve_password(params, prompt_title = None)
+	pg_param.resolve_password(params, prompt_title = prompt_title)
 	return driver.connect(**params)
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -24,7 +24,6 @@
 from abc import abstractmethod, abstractproperty
 
 from .. import lib as pg_lib
-from ..lib import sys as pg_sys
 
 from .. import versionstring as pg_version
 from .. import iri as pg_iri
@@ -1919,7 +1918,7 @@ def connect(self):
 			),
 		)
 		# manual binding
-		self.sys = pg_lib.Binding(self, pg_sys)
+		self.sys = pg_lib.Binding(self, pg_lib.sys)
 
 		# Get the *full* version string.
 		self.version = self.prepare("SELECT pg_catalog.version()").first()
