From 5f35b45b0b15e0f66608b9c774b76f39e7aa93ee Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Fri, 6 Dec 2019 14:47:44 -0800 Subject: Switch to Wikimedia Commons as default site Commons is intended as a repository for freely-usable media, so it makes more sense for it to be the default, and most images on Wikimedia sites (like English Wikipedia) are also available there. The functionality for specifying alternate sites is left in case users want to download fair-use media, which is not available on Commons, as well as for the possible future integration with non-Wikimedia MediaWiki sites (like Fandom/Wikia). --- test/test_wikiget.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'test') diff --git a/test/test_wikiget.py b/test/test_wikiget.py index 8aaaec8..6bd1c9d 100644 --- a/test/test_wikiget.py +++ b/test/test_wikiget.py @@ -29,8 +29,8 @@ def test_invalid_site_input(): """ Invalid site strings should not return regex match objects. """ - invalid_input = ["example.com", "vim.wikia.com", - "en.wikipedia.com", "en.wikimpedia.org"] + invalid_input = ['example.com', 'vim.wikia.com', + 'en.wikipedia.com', 'en.wikimpedia.org'] for i in invalid_input: site_match = wikiget.valid_site(i) assert site_match is None @@ -40,8 +40,8 @@ def test_valid_site_input(): """ Valid site strings should return regex match objects. """ - valid_input = ["en.wikipedia.org", "commons.wikimedia.org", - "de.wikipedia.org", "meta.wikimedia.org"] + valid_input = ['en.wikipedia.org', 'commons.wikimedia.org', + 'de.wikipedia.org', 'meta.wikimedia.org'] for i in valid_input: site_match = wikiget.valid_site(i) assert site_match is not None @@ -53,20 +53,20 @@ def test_file_regex(): to the file prefix and name. :return: """ - i = "File:Example.jpg" + i = 'File:Example.jpg' file_match = wikiget.valid_file(i) assert file_match is not None - assert file_match.group(0) == "File:Example.jpg" # entire match - assert file_match.group(1) == "File:" # first group - assert file_match.group(2) == "Example.jpg" # second group + assert file_match.group(0) == 'File:Example.jpg' # entire match + assert file_match.group(1) == 'File:' # first group + assert file_match.group(2) == 'Example.jpg' # second group def test_invalid_file_input(): """ Invalid file strings should not return regex match objects. """ - invalid_input = ["file:example", "example.jpg", "Foo Bar.gif", - "Fil:Example.jpg"] + invalid_input = ['file:example', 'example.jpg', 'Foo Bar.gif', + 'Fil:Example.jpg'] for i in invalid_input: file_match = wikiget.valid_file(i) assert file_match is None @@ -76,9 +76,9 @@ def test_valid_file_input(): """ Valid file strings should return regex match objects. """ - valid_input = ["Image:example.jpg", "file:example.jpg", - "File:example.file-01.jpg", "FILE:FOO.BMP", - "File:ß handwritten sample.gif", "File:A (1).jpeg"] + valid_input = ['Image:example.jpg', 'file:example.jpg', + 'File:example.file-01.jpg', 'FILE:FOO.BMP', + 'File:ß handwritten sample.gif', 'File:A (1).jpeg'] for i in valid_input: file_match = wikiget.valid_file(i) assert file_match is not None @@ -89,14 +89,14 @@ def test_verify_hash(): Confirm that verify_hash returns the proper SHA1 hash. """ # TODO: do we need to actually create a file? - file_name = "testfile" - file_contents = "foobar" - file_sha1 = "8843d7f92416211de9ebb963ff4ce28125932878" + file_name = 'testfile' + file_contents = 'foobar' + file_sha1 = '8843d7f92416211de9ebb963ff4ce28125932878' try: - dl = open(file_name, "w") + dl = open(file_name, 'w') except PermissionError: - pytest.skip("need write access to create test file") + pytest.skip('need write access to create test file') else: with dl: dl.write(file_contents) -- cgit v1.2.3