Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[dbapi] fix connect backwards compat harder stable
authorJulien Cristau <julien.cristau@logilab.fr>
Tue, 14 May 2013 18:02:24 +0200 (2013-05-14)
branchstable
changeset 8983 2a244f90a1e3
parent 8982 6bc1c1b4473a
child 8987 d9195dce3a5b
[dbapi] fix connect backwards compat harder Passing None as group and host should result in "pyro:///cubicweb.appid", not "pyro://None/None.appid". Followup for 2091d275fe5c. Closes #2882666.
dbapi.py file | annotate | diff | comparison | revisions 
--- a/dbapi.py	Thu May 23 12:35:02 2013 +0200
+++ b/dbapi.py	Tue May 14 18:02:24 2013 +0200
@@ -213,9 +213,13 @@
         elif cnxprops and cnxprops.cnxtype == 'inmemory':
             database = 'inmemory://' + database
         else:
-            database = 'pyro://%s/%s.%s' % (kwargs.pop('host', ''),
-                                            kwargs.pop('group', 'cubicweb'),
-                                            database)
+            host = kwargs.pop('host', None)
+            if host is None:
+                host = ''
+            group = kwargs.pop('group', None)
+            if group is None:
+                group = 'cubicweb'
+            database = 'pyro://%s/%s.%s' % (host, group, database)
     puri = urlparse(database)
     method = puri.scheme.lower()
     if method == 'inmemory':
cubicweb