Disable universal newlines when reading TOML (#10893)

* Disable universal newlines when reading TOML

* Update mypy/modulefinder.py

Co-authored-by: Taneli Hukkinen <[email protected]>

* Update mypy/config_parser.py

Co-authored-by: Taneli Hukkinen <[email protected]>

Co-authored-by: Ivan Levkivskyi <[email protected]>

Author: 2 people

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
-tomli>=1.1.0,<1.2.0
+tomli>=1.1.0,<2.0.0

mypy/config_parser.py

@@ -169,7 +169,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:

mypy/modulefinder.py

@@ -439,8 +439,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:

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'},