From cbdc4b9ad9bdb20a4e0ad17f9d5af26147b771f9 Mon Sep 17 00:00:00 2001 From: adroullier Date: Thu, 19 Oct 2023 17:40:31 +0200 Subject: Adding script name to 'global_config' during application setup as '__script__' --- src/pyramid/scripts/prequest.py | 4 ++++ src/pyramid/scripts/proutes.py | 4 ++++ src/pyramid/scripts/pserve.py | 4 ++++ src/pyramid/scripts/pshell.py | 4 ++++ src/pyramid/scripts/ptweens.py | 4 ++++ src/pyramid/scripts/pviews.py | 4 ++++ 6 files changed, 24 insertions(+) (limited to 'src') diff --git a/src/pyramid/scripts/prequest.py b/src/pyramid/scripts/prequest.py index ab5e81dfc..b7f148430 100644 --- a/src/pyramid/scripts/prequest.py +++ b/src/pyramid/scripts/prequest.py @@ -45,6 +45,7 @@ class PRequestCommand: the request's WSGI environment, so your application can distinguish these calls from normal requests. """ + script_name = 'prequest' parser = argparse.ArgumentParser( description=textwrap.dedent(description), @@ -136,6 +137,9 @@ class PRequestCommand: return 2 config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) + # bw update 2.1 don't overwrite if set + if not '__script__' in config_vars: + config_vars['__script__'] = self.script_name path = self.args.path_info loader = self._get_config_loader(config_uri) diff --git a/src/pyramid/scripts/proutes.py b/src/pyramid/scripts/proutes.py index 9c54c06cc..ec3075be6 100644 --- a/src/pyramid/scripts/proutes.py +++ b/src/pyramid/scripts/proutes.py @@ -224,6 +224,7 @@ class PRoutesCommand: will be assumed. Example: 'proutes myapp.ini'. """ + script_name = 'proutes' bootstrap = staticmethod(bootstrap) # testing get_config_loader = staticmethod(get_config_loader) # testing stdout = sys.stdout @@ -316,6 +317,9 @@ class PRoutesCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) + # bw update 2.1 don't overwrite if set + if not '__script__' in config_vars: + config_vars['__script__'] = self.script_name loader = self.get_config_loader(config_uri) loader.setup_logging(config_vars) self.proutes_file_config(loader, config_vars) diff --git a/src/pyramid/scripts/pserve.py b/src/pyramid/scripts/pserve.py index 0c4782ce5..48048f893 100644 --- a/src/pyramid/scripts/pserve.py +++ b/src/pyramid/scripts/pserve.py @@ -39,6 +39,7 @@ class PServeCommand: You can also include variable assignments like 'http_port=8080' and then use %(http_port)s in your config files. """ + script_name = 'pserve' default_verbosity = 1 parser = argparse.ArgumentParser( @@ -183,6 +184,9 @@ class PServeCommand: return 2 config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) + # bw update 2.1 don't overwrite if set + if not '__script__' in config_vars: + config_vars['__script__'] = self.script_name app_spec = self.args.config_uri app_name = self.args.app_name diff --git a/src/pyramid/scripts/pshell.py b/src/pyramid/scripts/pshell.py index 09baf1736..c5e5c2fb2 100644 --- a/src/pyramid/scripts/pshell.py +++ b/src/pyramid/scripts/pshell.py @@ -38,6 +38,7 @@ class PShellCommand: than one Pyramid application within it, the loader will use the last one. """ + script_name = 'pshell' bootstrap = staticmethod(bootstrap) # for testing get_config_loader = staticmethod(get_config_loader) # for testing pkg_resources = pkg_resources # for testing @@ -130,6 +131,9 @@ class PShellCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) + # bw update 2.1 don't overwrite if set + if not '__script__' in config_vars: + config_vars['__script__'] = self.script_name loader = self.get_config_loader(config_uri) loader.setup_logging(config_vars) self.pshell_file_config(loader, config_vars) diff --git a/src/pyramid/scripts/ptweens.py b/src/pyramid/scripts/ptweens.py index 494575ff7..ca8469169 100644 --- a/src/pyramid/scripts/ptweens.py +++ b/src/pyramid/scripts/ptweens.py @@ -27,6 +27,7 @@ class PTweensCommand: will be assumed. Example: "ptweens myapp.ini#main". """ + script_name = 'ptweens' parser = argparse.ArgumentParser( description=textwrap.dedent(description), formatter_class=argparse.RawDescriptionHelpFormatter, @@ -81,6 +82,9 @@ class PTweensCommand: return 2 config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) + # bw update 2.1 don't overwrite if set + if not '__script__' in config_vars: + config_vars['__script__'] = self.script_name self.setup_logging(config_uri, global_conf=config_vars) env = self.bootstrap(config_uri, options=config_vars) registry = env['registry'] diff --git a/src/pyramid/scripts/pviews.py b/src/pyramid/scripts/pviews.py index f35daad45..da9881434 100644 --- a/src/pyramid/scripts/pviews.py +++ b/src/pyramid/scripts/pviews.py @@ -27,6 +27,7 @@ class PViewsCommand: specifies the path info portion of a URL that will be used to find matching views. Example: 'proutes myapp.ini#main /url' """ + script_name = 'pviews' stdout = sys.stdout parser = argparse.ArgumentParser( @@ -248,6 +249,9 @@ class PViewsCommand: return 2 config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) + # bw update 2.1 don't overwrite if set + if not '__script__' in config_vars: + config_vars['__script__'] = self.script_name url = self.args.url self.setup_logging(config_uri, global_conf=config_vars) -- cgit v1.2.3 From 74d675cea04335a17600a65bee8e0b0c5ca058a7 Mon Sep 17 00:00:00 2001 From: adroullier Date: Tue, 24 Oct 2023 14:01:24 +0200 Subject: Fix 'tox -e lint' tests --- src/pyramid/scripts/prequest.py | 2 +- src/pyramid/scripts/proutes.py | 2 +- src/pyramid/scripts/pserve.py | 2 +- src/pyramid/scripts/pshell.py | 2 +- src/pyramid/scripts/ptweens.py | 2 +- src/pyramid/scripts/pviews.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/pyramid/scripts/prequest.py b/src/pyramid/scripts/prequest.py index b7f148430..3db268896 100644 --- a/src/pyramid/scripts/prequest.py +++ b/src/pyramid/scripts/prequest.py @@ -138,7 +138,7 @@ class PRequestCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) # bw update 2.1 don't overwrite if set - if not '__script__' in config_vars: + if '__script__' not in config_vars: config_vars['__script__'] = self.script_name path = self.args.path_info diff --git a/src/pyramid/scripts/proutes.py b/src/pyramid/scripts/proutes.py index ec3075be6..fdafc6880 100644 --- a/src/pyramid/scripts/proutes.py +++ b/src/pyramid/scripts/proutes.py @@ -318,7 +318,7 @@ class PRoutesCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) # bw update 2.1 don't overwrite if set - if not '__script__' in config_vars: + if '__script__' not in config_vars: config_vars['__script__'] = self.script_name loader = self.get_config_loader(config_uri) loader.setup_logging(config_vars) diff --git a/src/pyramid/scripts/pserve.py b/src/pyramid/scripts/pserve.py index 48048f893..55878c3fa 100644 --- a/src/pyramid/scripts/pserve.py +++ b/src/pyramid/scripts/pserve.py @@ -185,7 +185,7 @@ class PServeCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) # bw update 2.1 don't overwrite if set - if not '__script__' in config_vars: + if '__script__' not in config_vars: config_vars['__script__'] = self.script_name app_spec = self.args.config_uri app_name = self.args.app_name diff --git a/src/pyramid/scripts/pshell.py b/src/pyramid/scripts/pshell.py index c5e5c2fb2..ba51745f3 100644 --- a/src/pyramid/scripts/pshell.py +++ b/src/pyramid/scripts/pshell.py @@ -132,7 +132,7 @@ class PShellCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) # bw update 2.1 don't overwrite if set - if not '__script__' in config_vars: + if '__script__' not in config_vars: config_vars['__script__'] = self.script_name loader = self.get_config_loader(config_uri) loader.setup_logging(config_vars) diff --git a/src/pyramid/scripts/ptweens.py b/src/pyramid/scripts/ptweens.py index ca8469169..1722d9261 100644 --- a/src/pyramid/scripts/ptweens.py +++ b/src/pyramid/scripts/ptweens.py @@ -83,7 +83,7 @@ class PTweensCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) # bw update 2.1 don't overwrite if set - if not '__script__' in config_vars: + if '__script__' not in config_vars: config_vars['__script__'] = self.script_name self.setup_logging(config_uri, global_conf=config_vars) env = self.bootstrap(config_uri, options=config_vars) diff --git a/src/pyramid/scripts/pviews.py b/src/pyramid/scripts/pviews.py index da9881434..94c843821 100644 --- a/src/pyramid/scripts/pviews.py +++ b/src/pyramid/scripts/pviews.py @@ -250,7 +250,7 @@ class PViewsCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) # bw update 2.1 don't overwrite if set - if not '__script__' in config_vars: + if '__script__' not in config_vars: config_vars['__script__'] = self.script_name url = self.args.url -- cgit v1.2.3 From 93140efbfca56a183fe70256fe34c83b607b58d7 Mon Sep 17 00:00:00 2001 From: adroullier Date: Mon, 30 Oct 2023 16:11:11 +0100 Subject: set script name via dict.setdefault() --- src/pyramid/scripts/prequest.py | 4 +--- src/pyramid/scripts/proutes.py | 4 +--- src/pyramid/scripts/pserve.py | 4 +--- src/pyramid/scripts/pshell.py | 4 +--- src/pyramid/scripts/ptweens.py | 4 +--- src/pyramid/scripts/pviews.py | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/pyramid/scripts/prequest.py b/src/pyramid/scripts/prequest.py index 3db268896..c537ae677 100644 --- a/src/pyramid/scripts/prequest.py +++ b/src/pyramid/scripts/prequest.py @@ -137,9 +137,7 @@ class PRequestCommand: return 2 config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) - # bw update 2.1 don't overwrite if set - if '__script__' not in config_vars: - config_vars['__script__'] = self.script_name + config_vars.setdefault('__script__', self.script_name) path = self.args.path_info loader = self._get_config_loader(config_uri) diff --git a/src/pyramid/scripts/proutes.py b/src/pyramid/scripts/proutes.py index fdafc6880..9d419bd8b 100644 --- a/src/pyramid/scripts/proutes.py +++ b/src/pyramid/scripts/proutes.py @@ -317,9 +317,7 @@ class PRoutesCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) - # bw update 2.1 don't overwrite if set - if '__script__' not in config_vars: - config_vars['__script__'] = self.script_name + config_vars.setdefault('__script__', self.script_name) loader = self.get_config_loader(config_uri) loader.setup_logging(config_vars) self.proutes_file_config(loader, config_vars) diff --git a/src/pyramid/scripts/pserve.py b/src/pyramid/scripts/pserve.py index 55878c3fa..b4a4af977 100644 --- a/src/pyramid/scripts/pserve.py +++ b/src/pyramid/scripts/pserve.py @@ -184,9 +184,7 @@ class PServeCommand: return 2 config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) - # bw update 2.1 don't overwrite if set - if '__script__' not in config_vars: - config_vars['__script__'] = self.script_name + config_vars.setdefault('__script__', self.script_name) app_spec = self.args.config_uri app_name = self.args.app_name diff --git a/src/pyramid/scripts/pshell.py b/src/pyramid/scripts/pshell.py index ba51745f3..9122ab32e 100644 --- a/src/pyramid/scripts/pshell.py +++ b/src/pyramid/scripts/pshell.py @@ -131,9 +131,7 @@ class PShellCommand: config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) - # bw update 2.1 don't overwrite if set - if '__script__' not in config_vars: - config_vars['__script__'] = self.script_name + config_vars.setdefault('__script__', self.script_name) loader = self.get_config_loader(config_uri) loader.setup_logging(config_vars) self.pshell_file_config(loader, config_vars) diff --git a/src/pyramid/scripts/ptweens.py b/src/pyramid/scripts/ptweens.py index 1722d9261..cb19eec12 100644 --- a/src/pyramid/scripts/ptweens.py +++ b/src/pyramid/scripts/ptweens.py @@ -82,9 +82,7 @@ class PTweensCommand: return 2 config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) - # bw update 2.1 don't overwrite if set - if '__script__' not in config_vars: - config_vars['__script__'] = self.script_name + config_vars.setdefault('__script__', self.script_name) self.setup_logging(config_uri, global_conf=config_vars) env = self.bootstrap(config_uri, options=config_vars) registry = env['registry'] diff --git a/src/pyramid/scripts/pviews.py b/src/pyramid/scripts/pviews.py index 94c843821..be19e48bc 100644 --- a/src/pyramid/scripts/pviews.py +++ b/src/pyramid/scripts/pviews.py @@ -249,9 +249,7 @@ class PViewsCommand: return 2 config_uri = self.args.config_uri config_vars = parse_vars(self.args.config_vars) - # bw update 2.1 don't overwrite if set - if '__script__' not in config_vars: - config_vars['__script__'] = self.script_name + config_vars.setdefault('__script__', self.script_name) url = self.args.url self.setup_logging(config_uri, global_conf=config_vars) -- cgit v1.2.3 From 13b86c1cbacde80f806df01adf5a59d7f97cee6c Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sat, 27 Jan 2024 17:46:01 -0700 Subject: add bootstrap value when an app is loaded via bootstrap --- src/pyramid/paster.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/pyramid/paster.py b/src/pyramid/paster.py index f14acacf7..30e4f3e27 100644 --- a/src/pyramid/paster.py +++ b/src/pyramid/paster.py @@ -114,6 +114,8 @@ def bootstrap(config_uri, request=None, options=None): by the ``closer``. """ + options = dict(options or {}) + options.setdefault('__script__', 'bootstrap') app = get_app(config_uri, options=options) env = prepare(request) env['app'] = app -- cgit v1.2.3