From 0742a9bff33d5c80f87f3faa57b50dd6d4eb0d55 Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Mon, 21 Sep 2020 17:01:22 +0100 Subject: [PATCH] Implement suggestions --- Lib/fontTools/misc/plistlib/__init__.py | 7 ++++--- dev-requirements.txt | 2 +- setup.py | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/fontTools/misc/plistlib/__init__.py b/Lib/fontTools/misc/plistlib/__init__.py index 92c80b450..1335e8cbe 100644 --- a/Lib/fontTools/misc/plistlib/__init__.py +++ b/Lib/fontTools/misc/plistlib/__init__.py @@ -11,7 +11,6 @@ from typing import ( Optional, Sequence, Type, - TypeVar, Union, IO, ) @@ -78,7 +77,8 @@ def _date_from_string(s: str) -> datetime: if val is None: break lst.append(int(val)) - return datetime(lst[0], lst[1], lst[2], lst[3], lst[4], lst[5]) + # NOTE: mypy doesn't know that lst is 6 elements long. + return datetime(*lst) # type:ignore def _date_to_string(d: datetime) -> str: @@ -393,6 +393,7 @@ def _date_element(date: datetime, ctx: SimpleNamespace) -> etree.Element: def _data_element(data: bytes, ctx: SimpleNamespace) -> etree.Element: el = etree.Element("data") + # NOTE: mypy is confused about whether el.text should be str or bytes. el.text = _encode_base64( # type: ignore data, maxlinelength=(76 if ctx.pretty_print else None), @@ -577,7 +578,7 @@ def loads( def dump( value: PlistEncodable, - fp: IO[Any], + fp: IO[bytes], sort_keys: bool = True, skipkeys: bool = False, use_builtin_types: Optional[bool] = None, diff --git a/dev-requirements.txt b/dev-requirements.txt index 6ebb76bf5..73eae6803 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,4 +2,4 @@ pytest>=3.0 tox>=2.5 bump2version>=0.5.6 sphinx>=1.5.5 -mypy +mypy>=0.782 diff --git a/setup.py b/setup.py index 205a59034..220814fa0 100755 --- a/setup.py +++ b/setup.py @@ -452,7 +452,6 @@ setup_params = dict( packages=find_packages("Lib"), include_package_data=True, data_files=find_data_files(), - zip_safe=False, # So mypy can find typing information. ext_modules=ext_modules, setup_requires=setup_requires, extras_require=extras_require,