set script name via dict.setdefault()

6 files changed, 6 insertions, 18 deletions

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)