equal
deleted
inserted
replaced
211 if cnxprops and cnxprops.cnxtype == 'zmq': |
211 if cnxprops and cnxprops.cnxtype == 'zmq': |
212 database = kwargs.pop('host') |
212 database = kwargs.pop('host') |
213 elif cnxprops and cnxprops.cnxtype == 'inmemory': |
213 elif cnxprops and cnxprops.cnxtype == 'inmemory': |
214 database = 'inmemory://' + database |
214 database = 'inmemory://' + database |
215 else: |
215 else: |
216 database = 'pyro://%s/%s.%s' % (kwargs.pop('host', ''), |
216 host = kwargs.pop('host', None) |
217 kwargs.pop('group', 'cubicweb'), |
217 if host is None: |
218 database) |
218 host = '' |
|
219 group = kwargs.pop('group', None) |
|
220 if group is None: |
|
221 group = 'cubicweb' |
|
222 database = 'pyro://%s/%s.%s' % (host, group, database) |
219 puri = urlparse(database) |
223 puri = urlparse(database) |
220 method = puri.scheme.lower() |
224 method = puri.scheme.lower() |
221 if method == 'inmemory': |
225 if method == 'inmemory': |
222 config = cwconfig.instance_configuration(puri.path) |
226 config = cwconfig.instance_configuration(puri.path) |
223 else: |
227 else: |