[Config] Fix get() functionality (#815)

This commit is contained in:
Will 2017-06-16 14:35:32 -04:00 committed by Twentysix
parent 68bc6e3325
commit 422bbba7f6
3 changed files with 21 additions and 6 deletions

View File

@ -443,10 +443,10 @@ class Config(BaseConfig):
:return: :return:
""" """
try: if default is not None:
return getattr(self, key)(default=default) return self._get_value_from_key(key)(default)
except AttributeError: else:
return return self._get_value_from_key(key)()
async def set(self, key, value): async def set(self, key, value):
# Notice to future developers: # Notice to future developers:

View File

@ -18,7 +18,7 @@ def json_driver(tmpdir_factory):
return driver return driver
@pytest.fixture(scope="module") @pytest.fixture()
def config(json_driver): def config(json_driver):
return Config( return Config(
cog_name="PyTest", cog_name="PyTest",
@ -26,7 +26,7 @@ def config(json_driver):
driver_spawn=json_driver) driver_spawn=json_driver)
@pytest.fixture(scope="module") @pytest.fixture()
def config_fr(json_driver): def config_fr(json_driver):
""" """
Mocked config object with force_register enabled. Mocked config object with force_register enabled.

View File

@ -145,3 +145,18 @@ async def test_set_channel_no_register(config, empty_channel):
await config.channel(empty_channel).set("no_register", True) await config.channel(empty_channel).set("no_register", True)
assert config.channel(empty_channel).no_register() is True assert config.channel(empty_channel).no_register() is True
#endregion #endregion
# region Getting Values
def test_get_func_w_reg(config):
config.register_global(
thing=True
)
assert config.get("thing") is True
assert config.get("thing", False) is False
def test_get_func_wo_reg(config):
assert config.get("thing") is None
assert config.get("thing", True) is True
# endregion