diff options
author | Bernát Gábor <bgabor8@bloomberg.net> | 2021-01-11 11:08:30 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-11 11:08:30 +0000 |
commit | 4cf619a95b2ab14632d2fb6e62335d792da75c37 (patch) | |
tree | 49d705b392dea0ee00bd1f4163aeb780b7bb26ea /src/tox/config/main.py | |
parent | 68cbc356ebc041f700c3c49a0f7f1ce522f7e66c (diff) | |
download | tox-git-4cf619a95b2ab14632d2fb6e62335d792da75c37.tar.gz |
Better handling of set_env (#1784)
Diffstat (limited to 'src/tox/config/main.py')
-rw-r--r-- | src/tox/config/main.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/tox/config/main.py b/src/tox/config/main.py index 790c6e4e..150002c9 100644 --- a/src/tox/config/main.py +++ b/src/tox/config/main.py @@ -5,7 +5,7 @@ from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence from tox.config.loader.api import Loader, Override, OverrideMap from tox.config.source import Source -from .sets import ConfigSet, CoreConfigSet +from .sets import CoreConfigSet, EnvConfigSet class Config: @@ -26,9 +26,9 @@ class Config: self._overrides[override.namespace].append(override) self._src = config_source - self._env_to_set: Dict[str, ConfigSet] = OrderedDict() + self._env_to_set: Dict[str, EnvConfigSet] = OrderedDict() self._core_set: Optional[CoreConfigSet] = None - self.register_config_set: Callable[[str, ConfigSet], Any] = lambda n, e: None + self.register_config_set: Callable[[str, EnvConfigSet], Any] = lambda n, e: None @property def core(self) -> CoreConfigSet: @@ -44,11 +44,13 @@ class Config: self._core_set = core return core - def get_env(self, item: str, package: bool = False, loaders: Optional[Sequence[Loader[Any]]] = None) -> ConfigSet: + def get_env( + self, item: str, package: bool = False, loaders: Optional[Sequence[Loader[Any]]] = None + ) -> EnvConfigSet: try: return self._env_to_set[item] except KeyError: - env = ConfigSet(self, item) + env = EnvConfigSet(self, item) self._env_to_set[item] = env if loaders is not None: env.loaders.extend(loaders) |