diff --git a/mypy-requirements.txt b/mypy-requirements.txt index 8c798a3c640d..083dab308ef4 100644 --- a/mypy-requirements.txt +++ b/mypy-requirements.txt @@ -1,4 +1,4 @@ typing_extensions>=3.7.4 mypy_extensions>=0.4.3,<0.5.0 typed_ast>=1.4.0,<2; python_version<'3.8' -tomli>=1.1.0,<1.2.0 +tomli>=1.1.0,<2.0.0 diff --git a/mypy/config_parser.py b/mypy/config_parser.py index 5dd8fef2523d..24e61df0441c 100644 --- a/mypy/config_parser.py +++ b/mypy/config_parser.py @@ -172,7 +172,7 @@ def parse_config_file(options: Options, set_strict_flags: Callable[[], None], try: if is_toml(config_file): with open(config_file, encoding="utf-8") as f: - toml_data = tomli.load(f) + toml_data = tomli.loads(f.read()) # Filter down to just mypy relevant toml keys toml_data = toml_data.get('tool', {}) if 'mypy' not in toml_data: diff --git a/mypy/modulefinder.py b/mypy/modulefinder.py index 8a0eb3a71a0d..8dcaee6f99d6 100644 --- a/mypy/modulefinder.py +++ b/mypy/modulefinder.py @@ -451,8 +451,8 @@ def _is_compatible_stub_package(self, stub_dir: str) -> bool: if os.path.isfile(metadata_fnam): # Delay import for a possible minor performance win. import tomli - with open(metadata_fnam, 'r', encoding="utf-8") as f: - metadata = tomli.load(f) + with open(metadata_fnam, encoding="utf-8") as f: + metadata = tomli.loads(f.read()) if self.python_major_ver == 2: return bool(metadata.get('python2', False)) else: diff --git a/setup.py b/setup.py index 36163f254265..bac28783636c 100644 --- a/setup.py +++ b/setup.py @@ -193,7 +193,7 @@ def run(self): install_requires=["typed_ast >= 1.4.0, < 2; python_version<'3.8'", 'typing_extensions>=3.7.4', 'mypy_extensions >= 0.4.3, < 0.5.0', - 'tomli>=1.1.0,<1.2.0', + 'tomli>=1.1.0,<2.0.0', ], # Same here. extras_require={'dmypy': 'psutil >= 4.0', 'python2': 'typed_ast >= 1.4.0, < 2'},