diff -r cda1bdc3652e -r 684215aca046 cwctl.py --- a/cwctl.py Mon Dec 01 11:52:58 2014 +0100 +++ b/cwctl.py Tue Mar 03 14:57:34 2015 +0100 @@ -1,4 +1,4 @@ -# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved. # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr # # This file is part of CubicWeb. @@ -401,7 +401,7 @@ if 'type' in odict and odict.get('level') <= self.config.config_level) for section in sections: - if section not in ('main', 'email', 'pyro', 'web'): + if section not in ('main', 'email', 'web'): print '\n' + underline_title('%s options' % section) config.input_config(section, self.config.config_level) # write down configuration @@ -900,9 +900,7 @@ ('repo-uri', {'short': 'H', 'type' : 'string', 'metavar': '://<[host][:port]>', 'help': 'URI of the CubicWeb repository to connect to. URI can be \ -pyro://[host:port] the Pyro name server host; if the pyro nameserver is not set, \ -it will be detected by using a broadcast query, a ZMQ URL or \ -inmemory:// (default) use an in-memory repository. THIS OPTION IS DEPRECATED, \ +a ZMQ URL or inmemory:// (default) use an in-memory repository. THIS OPTION IS DEPRECATED, \ directly give URI as instance id instead', 'group': 'remote' }), @@ -953,7 +951,7 @@ if self.config.repo_uri: warn('[3.16] --repo-uri option is deprecated, directly give the URI as instance id', DeprecationWarning) - if urlparse(self.config.repo_uri).scheme in ('pyro', 'inmemory'): + if urlparse(self.config.repo_uri).scheme == 'inmemory': appuri = '%s/%s' % (self.config.repo_uri.rstrip('/'), appuri) from cubicweb.utils import parse_repo_uri