# HG changeset patch # User Sylvain Thénault # Date 1478688319 -3600 # Node ID 8a04a2cb5ba498037349308e714f51fa61046040 # Parent 4e0829ade86fd7f702f034e12a5c8cc12c253ec9 [pyramid] No more need to check CW version since it's now shipped with it diff -r 4e0829ade86f -r 8a04a2cb5ba4 cubicweb/pyramid/pyramidctl.py --- a/cubicweb/pyramid/pyramidctl.py Wed Nov 09 11:44:27 2016 +0100 +++ b/cubicweb/pyramid/pyramidctl.py Wed Nov 09 11:45:19 2016 +0100 @@ -17,7 +17,6 @@ import subprocess from cubicweb import BadCommandUsage, ExecutionError -from cubicweb.__pkginfo__ import numversion as cwversion from cubicweb.cwconfig import CubicWebConfiguration as cwcfg from cubicweb.cwctl import CWCTL, InstanceCommand, init_cmdline_log_threshold from cubicweb.pyramid import wsgi_application_from_cwconfig @@ -86,17 +85,13 @@ 'metavar': 'N', 'help': 'Dump profile stats to ouput every N requests ' '(default: 100)'}), + ('param', + {'short': 'p', + 'type': 'named', + 'metavar': 'key1:value1,key2:value2', + 'default': {}, + 'help': 'override configuration file option with .'}), ) - if cwversion >= (3, 21, 0): - options = options + ( - ('param', - {'short': 'p', - 'type': 'named', - 'metavar': 'key1:value1,key2:value2', - 'default': {}, - 'help': 'override configuration file option with .', - }), - ) _reloader_environ_key = 'CW_RELOADER_SHOULD_RUN' _reloader_filelist_environ_key = 'CW_RELOADER_FILELIST' @@ -303,8 +298,6 @@ return self.restart_with_reloader() cwconfig = cwcfg.config_for(appid, debugmode=debugmode) - if cwversion >= (3, 21, 0): - cwconfig.cmdline_options = self.config.param if autoreload: _turn_sigterm_into_systemexit() self.debug('Running reloading file monitor')