code adjustments according to pep8

This commit is contained in:
Mike Fährmann
2017-01-30 19:40:15 +01:00
parent 8e93633319
commit 4f123b8513
19 changed files with 103 additions and 34 deletions

View File

@@ -12,6 +12,7 @@ import gallery_dl.config as config
import os
import tempfile
class TestConfig(unittest.TestCase):
def setUp(self):
@@ -51,5 +52,6 @@ class TestConfig(unittest.TestCase):
self.assertEqual(config.interpolate(["b", "d"], "2"), 123)
self.assertEqual(config.interpolate(["d", "d"], "2"), 123)
if __name__ == '__main__':
unittest.main()

View File

@@ -38,7 +38,7 @@ class TestExtractors(unittest.TestCase):
self.assertEqual(hjob.hash_content.hexdigest(), result["content"])
# dynamically genetate tests
# dynamically genertate tests
def _generate_test(extr, tcase):
def test(self):
url, result = tcase
@@ -46,6 +46,7 @@ def _generate_test(extr, tcase):
self._run_test(extr, url, result)
return test
# enable selective testing for direct calls
extractors = extractor.extractors()
if __name__ == '__main__' and len(sys.argv) > 1:

View File

@@ -10,6 +10,7 @@
import unittest
import gallery_dl.iso639_1 as iso639_1
class TestISO639_1(unittest.TestCase):
def test_code_to_language(self):
@@ -17,11 +18,13 @@ class TestISO639_1(unittest.TestCase):
self.assertEqual(iso639_1.code_to_language("FR"), "French")
self.assertEqual(iso639_1.code_to_language("xx"), "English")
self.assertEqual(iso639_1.code_to_language("xx", default=None), None)
def test_language_to_code(self):
self.assertEqual(iso639_1.language_to_code("English"), "en")
self.assertEqual(iso639_1.language_to_code("fRENch"), "fr")
self.assertEqual(iso639_1.language_to_code("Nothing"), "en")
self.assertEqual(iso639_1.language_to_code("Nothing", default=None), None)
self.assertEqual(iso639_1.language_to_code("xx"), "en")
self.assertEqual(iso639_1.language_to_code("xx", default=None), None)
if __name__ == '__main__':
unittest.main()

View File

@@ -11,6 +11,7 @@ import unittest
import sys
import gallery_dl.text as text
class TestText(unittest.TestCase):
def test_remove_html(self):
@@ -62,7 +63,7 @@ class TestText(unittest.TestCase):
}
for case, result in cases.items():
self.assertEqual(text.clean_path_windows(case), result[0])
self.assertEqual(text.clean_path_posix (case), result[1])
self.assertEqual(text.clean_path_posix(case), result[1])
def test_shorten_path(self):
cases = {
@@ -86,8 +87,9 @@ class TestText(unittest.TestCase):
}
enc = sys.getfilesystemencoding()
for case, result in cases.items():
self.assertEqual(text.shorten_filename(case), result)
self.assertTrue(len(text.shorten_filename(case).encode(enc)) <= 255)
fname = text.shorten_filename(case)
self.assertEqual(fname, result)
self.assertTrue(len(fname.encode(enc)) <= 255)
def test_extract(self):
cases = {
@@ -121,5 +123,6 @@ class TestText(unittest.TestCase):
result = ["c", "b", "a", "d"]
self.assertEqual(list(text.extract_iter(txt, "[", "]")), result)
if __name__ == '__main__':
unittest.main()