Fix serialization of driver parameters in IRI.

James William Pye · James William Pye · commit 9a332ea4f55a · 2009-04-02T19:47:41.000-07:00
Aside: cast the incoming timeout if it is not None.
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -2835,15 +2835,15 @@ def _pq_iri(self):
 			{
 				k : v for k,v in self.__dict__.items()
 				if v is not None \
-				and k not in ('_startup_parameters', '_address_family', '_pq_iri')
+				and k not in ('_startup_parameters', '_address_family', '_pq_iri', 'ife_ancestor')
 			},
 			obscure_password = True
 		)
 
 	def __repr__(self):
 		keywords = (',' + os.linesep + ' ').join([
 			'%s = %r' %(k, getattr(self, k, None)) for k in self.__dict__
-			if k not in ('_startup_parameters', '_address_family', '_pq_iri') \
+			if k not in ('_startup_parameters', '_address_family', '_pq_iri', 'ife_ancestor') \
 			and getattr(self, k, None) is not None
 		])
 		return '{mod}.{name}({keywords})'.format(
@@ -2926,7 +2926,7 @@ def __init__(self,
 class SocketCreator(object):
 	def __call__(self, timeout = None):
 		s = socket.socket(*self.socket_create)
-		s.settimeout(timeout)
+		s.settimeout(float(timeout) if timeout is not None else None)
 		s.connect(self.socket_connect)
 		s.settimeout(None)
 		return s
diff --git a/postgresql/iri.py b/postgresql/iri.py
@@ -92,7 +92,7 @@ def construct_path(x, re = escape_path_re):
 def construct(x, obscure_password = False):
 	'Construct a RI dictionary from a clientparams dictionary'
 	# the rather exhaustive settings choreography is due to
-	# a desire to allow 
+	# a desire to allow the search_path to be appended in the fragment
 	settings = x.get('settings')
 	no_path_settings = None
 	search_path = None
@@ -157,7 +157,8 @@ def construct(x, obscure_password = False):
 			ri.escape_path_re.sub(path_comp, '/')
 			for path_comp in path
 		]),
-		None if no_path_settings is None else (
+		(ri.construct_query(driver_params) if driver_params else None)
+		if no_path_settings is None else (
 			ri.construct_query(
 				driver_params + no_path_settings
 			)
