resolve conflict

tests/test_config.py

@@ -13,7 +13,7 @@ from sanic.exceptions import PyFileError
 def temp_path():
     """ a simple cross platform replacement for NamedTemporaryFile """
     with TemporaryDirectory() as td:
-        yield Path(td, 'file')
+        yield Path(td, "file")
 
 
 class Config:
@@ -23,9 +23,9 @@ class Config:
 
 def test_load_from_object(app):
     app.config.from_object(Config)
-    assert 'CONFIG_VALUE' in app.config
-    assert app.config.CONFIG_VALUE == 'should be used'
-    assert 'not_for_config' not in app.config
+    assert "CONFIG_VALUE" in app.config
+    assert app.config.CONFIG_VALUE == "should be used"
+    assert "not_for_config" not in app.config
 
 
 def test_load_from_object_string(app):
@@ -50,13 +50,13 @@ def test_auto_load_env():
 def test_dont_load_env():
     environ["SANIC_TEST_ANSWER"] = "42"
     app = Sanic(load_env=False)
-    assert getattr(app.config, 'TEST_ANSWER', None) is None
+    assert getattr(app.config, "TEST_ANSWER", None) is None
     del environ["SANIC_TEST_ANSWER"]
 
 
 def test_load_env_prefix():
     environ["MYAPP_TEST_ANSWER"] = "42"
-    app = Sanic(load_env='MYAPP_')
+    app = Sanic(load_env="MYAPP_")
     assert app.config.TEST_ANSWER == 42
     del environ["MYAPP_TEST_ANSWER"]
 
@@ -76,43 +76,47 @@ def test_load_env_prefix_string_value():
 
 
 def test_load_from_file(app):
-    config = dedent("""
+    config = dedent(
+        """
     VALUE = 'some value'
     condition = 1 == 1
     if condition:
         CONDITIONAL = 'should be set'
-    """)
+    """
+    )
     with temp_path() as config_path:
         config_path.write_text(config)
         app.config.from_pyfile(str(config_path))
-        assert 'VALUE' in app.config
-        assert app.config.VALUE == 'some value'
-        assert 'CONDITIONAL' in app.config
-        assert app.config.CONDITIONAL == 'should be set'
-        assert 'condition' not in app.config
+        assert "VALUE" in app.config
+        assert app.config.VALUE == "some value"
+        assert "CONDITIONAL" in app.config
+        assert app.config.CONDITIONAL == "should be set"
+        assert "condition" not in app.config
 
 
 def test_load_from_missing_file(app):
     with pytest.raises(IOError):
-        app.config.from_pyfile('non-existent file')
+        app.config.from_pyfile("non-existent file")
 
 
 def test_load_from_envvar(app):
     config = "VALUE = 'some value'"
     with temp_path() as config_path:
         config_path.write_text(config)
-        environ['APP_CONFIG'] = str(config_path)
-        app.config.from_envvar('APP_CONFIG')
-        assert 'VALUE' in app.config
-        assert app.config.VALUE == 'some value'
+        environ["APP_CONFIG"] = str(config_path)
+        app.config.from_envvar("APP_CONFIG")
+        assert "VALUE" in app.config
+        assert app.config.VALUE == "some value"
 
 
 def test_load_from_missing_envvar(app):
     with pytest.raises(RuntimeError) as e:
-        app.config.from_envvar('non-existent variable')
-        assert str(e.value) == ("The environment variable 'non-existent "
-                                "variable' is not set and thus configuration "
-                                "could not be loaded.")
+        app.config.from_envvar("non-existent variable")
+        assert str(e.value) == (
+            "The environment variable 'non-existent "
+            "variable' is not set and thus configuration "
+            "could not be loaded."
+        )
 
 
 def test_load_config_from_file_invalid_syntax(app):