From 2e243355f51654c8c6392c80a17b090f9f012fd1 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Mon, 24 Sep 2018 19:50:24 +0200
Subject: [PATCH] Fix some minor formatting issues
---
libmat2/archive.py | 2 +-
libmat2/office.py | 2 +-
libmat2/pdf.py | 2 +-
tests/test_climat2.py | 1 -
tests/test_corrupted_files.py | 16 +++++++++++-----
tests/test_deep_cleaning.py | 2 --
tests/test_libmat2.py | 2 +-
tests/test_policy.py | 1 -
8 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/libmat2/archive.py b/libmat2/archive.py
index 7b9f335..dd63c50 100644
--- a/libmat2/archive.py
+++ b/libmat2/archive.py
@@ -21,7 +21,7 @@ class ArchiveBasedAbstractParser(abstract.AbstractParser):
# Those are the files that we _do not_ want to keep,
# no matter if they are supported or not.
- files_to_omit = set() # type: Set[Pattern]
+ files_to_omit = set() # type: Set[Pattern]
# what should the parser do if it encounters an unknown file in
# the archive?
diff --git a/libmat2/office.py b/libmat2/office.py
index 07bbbb9..c6b324b 100644
--- a/libmat2/office.py
+++ b/libmat2/office.py
@@ -21,7 +21,7 @@ def _parse_xml(full_path: str):
for _, (key, value) in ET.iterparse(full_path, ("start-ns", )):
# The ns[0-9]+ namespaces are reserved for interal usage, so
# we have to use an other nomenclature.
- if re.match('^ns[0-9]+$', key, re.I): #pragma: no cover
+ if re.match('^ns[0-9]+$', key, re.I): # pragma: no cover
key = 'mat' + key[2:]
namespace_map[key] = value
diff --git a/libmat2/pdf.py b/libmat2/pdf.py
index bc7c8a6..5e19ef7 100644
--- a/libmat2/pdf.py
+++ b/libmat2/pdf.py
@@ -17,7 +17,7 @@ from gi.repository import Poppler, GLib
from . import abstract
poppler_version = Poppler.get_version()
-if LooseVersion(poppler_version) < LooseVersion('0.46'): # pragma: no cover
+if LooseVersion(poppler_version) < LooseVersion('0.46'): # pragma: no cover
raise ValueError("MAT2 needs at least Poppler version 0.46 to work. \
The installed version is %s." % poppler_version) # pragma: no cover
diff --git a/tests/test_climat2.py b/tests/test_climat2.py
index a94fc23..b84afdf 100644
--- a/tests/test_climat2.py
+++ b/tests/test_climat2.py
@@ -77,7 +77,6 @@ class TestCleanFolder(unittest.TestCase):
shutil.rmtree('./tests/data/folder/')
-
class TestCleanMeta(unittest.TestCase):
def test_jpg(self):
shutil.copy('./tests/data/dirty.jpg', './tests/data/clean.jpg')
diff --git a/tests/test_corrupted_files.py b/tests/test_corrupted_files.py
index 72d124f..aee1530 100644
--- a/tests/test_corrupted_files.py
+++ b/tests/test_corrupted_files.py
@@ -53,16 +53,21 @@ class TestUnsupportedFiles(unittest.TestCase):
class TestCorruptedEmbedded(unittest.TestCase):
def test_docx(self):
shutil.copy('./tests/data/embedded_corrupted.docx', './tests/data/clean.docx')
- parser, mimetype = parser_factory.get_parser('./tests/data/clean.docx')
+ parser, _ = parser_factory.get_parser('./tests/data/clean.docx')
self.assertFalse(parser.remove_all())
self.assertIsNotNone(parser.get_meta())
os.remove('./tests/data/clean.docx')
def test_odt(self):
+ expected = {
+ 'create_system': 'Weird',
+ 'date_time': '2018-06-10 17:18:18',
+ 'meta.xml': 'harmful content'
+ }
shutil.copy('./tests/data/embedded_corrupted.odt', './tests/data/clean.odt')
- parser, mimetype = parser_factory.get_parser('./tests/data/clean.odt')
+ parser, _ = parser_factory.get_parser('./tests/data/clean.odt')
self.assertFalse(parser.remove_all())
- self.assertEqual(parser.get_meta(), {'create_system': 'Weird', 'date_time': '2018-06-10 17:18:18', 'meta.xml': 'harmful content'})
+ self.assertEqual(parser.get_meta(), expected)
os.remove('./tests/data/clean.odt')
@@ -90,7 +95,7 @@ class TestCorruptedFiles(unittest.TestCase):
def test_png2(self):
shutil.copy('./tests/test_libmat2.py', './tests/clean.png')
- parser, mimetype = parser_factory.get_parser('./tests/clean.png')
+ parser, _ = parser_factory.get_parser('./tests/clean.png')
self.assertIsNone(parser)
os.remove('./tests/clean.png')
@@ -134,7 +139,8 @@ class TestCorruptedFiles(unittest.TestCase):
def test_bmp(self):
shutil.copy('./tests/data/dirty.png', './tests/data/clean.bmp')
- harmless.HarmlessParser('./tests/data/clean.bmp')
+ ret = harmless.HarmlessParser('./tests/data/clean.bmp')
+ self.assertIsNotNone(ret)
os.remove('./tests/data/clean.bmp')
def test_docx(self):
diff --git a/tests/test_deep_cleaning.py b/tests/test_deep_cleaning.py
index 82579a3..4f1920d 100644
--- a/tests/test_deep_cleaning.py
+++ b/tests/test_deep_cleaning.py
@@ -23,7 +23,6 @@ class TestZipMetadata(unittest.TestCase):
self.assertEqual(inside_p.get_meta(), {})
shutil.rmtree(tempdir)
-
def __check_zip_meta(self, p):
zipin = zipfile.ZipFile(p.filename)
for item in zipin.infolist():
@@ -135,4 +134,3 @@ class TestRsidRemoval(unittest.TestCase):
os.remove('./tests/data/clean.docx')
os.remove('./tests/data/clean.cleaned.docx')
-
diff --git a/tests/test_libmat2.py b/tests/test_libmat2.py
index d8c7b83..7a1a9e7 100644
--- a/tests/test_libmat2.py
+++ b/tests/test_libmat2.py
@@ -12,7 +12,7 @@ from libmat2 import check_dependencies
class TestCheckDependencies(unittest.TestCase):
def test_deps(self):
ret = check_dependencies()
- for key, value in ret.items():
+ for value in ret.values():
self.assertTrue(value)
diff --git a/tests/test_policy.py b/tests/test_policy.py
index 890f8c3..ef55644 100644
--- a/tests/test_policy.py
+++ b/tests/test_policy.py
@@ -29,4 +29,3 @@ class TestPolicy(unittest.TestCase):
with self.assertRaises(ValueError):
p.unknown_member_policy = UnknownMemberPolicy('unknown_policy_name_totally_invalid')
os.remove('./tests/data/clean.docx')
-
--
GitLab