diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-12-10 18:56:58 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-12-13 17:39:41 -0800 |
| commit | a8667577659a2622973dc80d177ac143fd161587 (patch) | |
| tree | acc14cfc1ca47c2e539deb4a6271e5d0c008ef4c | |
| parent | d631aff9fd4a144cb9fce265b644aa3affbb6188 (diff) | |
| download | pyramid-a8667577659a2622973dc80d177ac143fd161587.tar.gz pyramid-a8667577659a2622973dc80d177ac143fd161587.tar.bz2 pyramid-a8667577659a2622973dc80d177ac143fd161587.zip | |
refactor config_args to config_vars
| -rw-r--r-- | pyramid/scripts/prequest.py | 4 | ||||
| -rw-r--r-- | pyramid/scripts/proutes.py | 4 | ||||
| -rw-r--r-- | pyramid/scripts/pserve.py | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pyramid/scripts/prequest.py b/pyramid/scripts/prequest.py index 1da54b8c0..714aedf10 100644 --- a/pyramid/scripts/prequest.py +++ b/pyramid/scripts/prequest.py @@ -101,7 +101,7 @@ class PRequestCommand(object): ) parser.add_argument( - 'config_args', + 'config_vars', nargs='*', default=(), help='Arbitrary options to override those in the [app:main] section ' @@ -157,7 +157,7 @@ class PRequestCommand(object): headers[name] = value.strip() app = self.get_app(app_spec, self.args.app_name, - options=self.args.config_args) + options=self.args.config_vars) request_method = (self.args.method or 'GET').upper() diff --git a/pyramid/scripts/proutes.py b/pyramid/scripts/proutes.py index 26c112cde..df8e51e39 100644 --- a/pyramid/scripts/proutes.py +++ b/pyramid/scripts/proutes.py @@ -273,7 +273,7 @@ class PRoutesCommand(object): ) parser.add_argument( - 'config_args', + 'config_vars', nargs='*', default=(), help='Arbitrary options to override those in the [app:main] section ' @@ -334,7 +334,7 @@ class PRoutesCommand(object): return 2 config_uri = self.args.config_uri - env = self.bootstrap[0](config_uri, options=parse_vars(self.args.config_args)) + env = self.bootstrap[0](config_uri, options=parse_vars(self.args.config_vars)) registry = env['registry'] mapper = self._get_mapper(registry) diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index 3816e7c75..51cdd235a 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -104,7 +104,7 @@ class PServeCommand(object): help='The URI to the configuration file.', ) parser.add_argument( - 'config_args', + 'config_vars', nargs='*', default=(), help='Arbitrary options to override those in the [app:main] section ' @@ -128,8 +128,8 @@ class PServeCommand(object): if self.args.verbose > 0: print(msg) - def get_config_args(self): - restvars = self.args.config_args + def get_config_vars(self): + restvars = self.args.config_vars return parse_vars(restvars) def pserve_file_config(self, filename, global_conf=None): @@ -164,7 +164,7 @@ class PServeCommand(object): return 2 app_spec = self.args.config_uri - vars = self.get_config_args() + vars = self.get_config_vars() app_name = self.args.app_name base = os.getcwd() |