Fix 'tox -e lint' tests

src/pyramid/scripts/prequest.py

@@ -138,7 +138,7 @@ def run(self):
         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
 

src/pyramid/scripts/proutes.py

@@ -318,7 +318,7 @@ def run(self, quiet=False):
         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)

src/pyramid/scripts/pserve.py

@@ -185,7 +185,7 @@ def run(self):  # pragma: no cover
         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

src/pyramid/scripts/pshell.py

@@ -132,7 +132,7 @@ def run(self, shell=None):
         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)

src/pyramid/scripts/ptweens.py

@@ -83,7 +83,7 @@ def run(self):
         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)

src/pyramid/scripts/pviews.py

@@ -250,7 +250,7 @@ def run(self):
         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
 

tests/test_scripts/test_prequest.py

@@ -241,7 +241,10 @@ def test_command_method_configures_logging(self):
     def test_command_script_name(self):
         command = self._makeOne(['', '--method=GET', 'development.ini', '/'],)
         command.run()
-        self.assertEqual(self.loader.calls[0]['defaults']['__script__'], 'prequest')
+        self.assertEqual(
+            self.loader.calls[0]['defaults']['__script__'],
+            'prequest'
+        )
 
 
 class Test_main(unittest.TestCase):

tests/test_scripts/test_pserve.py

@@ -47,7 +47,10 @@ def get_app(name, global_conf):
         self.loader.server = lambda x: x
 
         inst.run()
-        self.assertEqual(app.global_conf, {'a': '1', 'b': '2', '__script__': 'pserve'})
+        self.assertEqual(
+            app.global_conf,
+            {'a': '1', 'b': '2', '__script__': 'pserve'}
+        )
 
     def test_original_ignore_files(self):
         msg = 'A change to "ignore_files" was detected'