From df73e065da9e4340fc8373911f7d741af7c01610 Mon Sep 17 00:00:00 2001
From: smagnin <simon@smagnin.org>
Date: Wed, 10 Oct 2018 21:22:28 +0200
Subject: [PATCH] Correct pylint
---
libmat2/archive.py | 2 +-
mat2 | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libmat2/archive.py b/libmat2/archive.py
index 3d70a9a..acfa006 100644
--- a/libmat2/archive.py
+++ b/libmat2/archive.py
@@ -70,6 +70,7 @@ class ArchiveBasedAbstractParser(abstract.AbstractParser):
metadata[name] = metadata_files
return metadata
+ # pylint: disable=too-many-branches
def _parse_files(self) -> tuple:
metadata = {} # type: dict
caller = sys._getframe(1).f_code.co_name
@@ -132,7 +133,6 @@ class ArchiveBasedAbstractParser(abstract.AbstractParser):
if abort:
os.remove(self.output_filename)
return metadata, abort
- # pylint: disable=too-many-branches
def remove_all(self) -> bool:
ret = self._parse_files()
diff --git a/mat2 b/mat2
index 9a63c6d..0bf8dfc 100755
--- a/mat2
+++ b/mat2
@@ -74,11 +74,12 @@ def show_meta(filename: str):
for k, v in metadata:
zipmeta = v
+ zipmeta_name = v
try: # FIXME this is ugly.
if not isinstance(zipmeta, dict):
print(" %s: %s" % (k, v))
except UnicodeEncodeError:
- print(" %s: harmful content" % k)
+ print(" %s: harmful content" % zipmeta_name)
if mtype == "application/zip":
print("[+] Metadata for files inside the archive :")
if isinstance(zipmeta, dict):
@@ -88,7 +89,7 @@ def show_meta(filename: str):
for meta_name, meta in metas.items():
print(" %s: %s" % (meta_name, meta))
except UnicodeEncodeError:
- print(" %s: harmful content" % k)
+ print(" %s: harmful content" % zipmeta_name)
def clean_meta(filename: str, is_lightweight: bool, policy: UnknownMemberPolicy) -> bool:
if not __check_file(filename, os.R_OK|os.W_OK):
--
GitLab