From 373bc3c1ac59ded179261042f05b079b0f9acba1 Mon Sep 17 00:00:00 2001 From: Timothy Crosley Date: Tue, 3 Mar 2020 23:05:32 -0800 Subject: Update to fix mypy and black linting errors --- isort/compat.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'isort/compat.py') diff --git a/isort/compat.py b/isort/compat.py index d3c0eb59..5a8a7176 100644 --- a/isort/compat.py +++ b/isort/compat.py @@ -7,7 +7,7 @@ from warnings import warn from . import api from .exceptions import ExistingSyntaxErrors, FileSkipped, IntroducedSyntaxErrors from .format import ask_whether_to_apply_changes_to_file, show_unified_diff -from .io import File +from .io import File, read_file from .settings import Config @@ -34,11 +34,14 @@ class SortImports: if filename: if file_contents: file_data = File.from_contents(file_contents, filename=filename) + file_stream, file_path, file_encoding = file_data + if not extension: + extension = file_data.extension else: - file_data = File.read(filename) - file_stream, file_path, file_encoding = file_data - if not extension: - extension = file_data.extension + with read_file(filename) as file_data: + file_stream, file_path, file_encoding = file_data + if not extension: + extension = file_data.extension else: file_stream = StringIO(file_contents) -- cgit v1.2.1