From f9943c5129ad9dc25aad650dc91c7d13fa07f356 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 27 Apr 2019 12:49:18 +0200
Subject: [PATCH] Simplify a bit the typing
---
libmat2/archive.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libmat2/archive.py b/libmat2/archive.py
index 3e24b71..1f02114 100644
--- a/libmat2/archive.py
+++ b/libmat2/archive.py
@@ -6,7 +6,7 @@ import tempfile
import os
import logging
import shutil
-from typing import Dict, Set, Pattern, Union, Any, List, Text
+from typing import Dict, Set, Pattern, Union, Any, List
from . import abstract, UnknownMemberPolicy, parser_factory
@@ -88,13 +88,13 @@ class ArchiveBasedAbstractParser(abstract.AbstractParser):
@staticmethod
@abc.abstractstaticmethod
- def _get_member_name(member: ArchiveMember) -> Text:
+ def _get_member_name(member: ArchiveMember) -> str:
"""Return the name of the given member."""
@staticmethod
@abc.abstractstaticmethod
def _add_file_to_archive(archive: ArchiveClass, member: ArchiveMember,
- full_path: Text):
+ full_path: str):
"""Add the file at full_path to the archive, via the given member."""
def get_meta(self) -> Dict[str, Union[str, dict]]:
@@ -247,7 +247,7 @@ class TarParser(ArchiveBasedAbstractParser):
@staticmethod
def _add_file_to_archive(archive: ArchiveClass, member: ArchiveMember,
- full_path: Text):
+ full_path: str):
assert isinstance(member, tarfile.TarInfo) # please mypy
assert isinstance(archive, tarfile.TarFile) # please mypy
archive.add(full_path, member.name, filter=TarParser._clean_member) # type: ignore
@@ -258,7 +258,7 @@ class TarParser(ArchiveBasedAbstractParser):
return archive.getmembers() # type: ignore
@staticmethod
- def _get_member_name(member: ArchiveMember) -> Text:
+ def _get_member_name(member: ArchiveMember) -> str:
assert isinstance(member, tarfile.TarInfo) # please mypy
return member.name
@@ -304,7 +304,7 @@ class ZipParser(ArchiveBasedAbstractParser):
@staticmethod
def _add_file_to_archive(archive: ArchiveClass, member: ArchiveMember,
- full_path: Text):
+ full_path: str):
assert isinstance(archive, zipfile.ZipFile) # please mypy
assert isinstance(member, zipfile.ZipInfo) # please mypy
with open(full_path, 'rb') as f:
@@ -316,6 +316,6 @@ class ZipParser(ArchiveBasedAbstractParser):
return archive.infolist() # type: ignore
@staticmethod
- def _get_member_name(member: ArchiveMember) -> Text:
+ def _get_member_name(member: ArchiveMember) -> str:
assert isinstance(member, zipfile.ZipInfo) # please mypy
return member.filename
--
GitLab