github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests for turboimagehost and pinterest

Browse Source
This commit is contained in:
Mike Fährmann
2017-01-27 22:39:44 +01:00
parent 3434c5a026
commit d82508f245
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gallery_dl/extractor/imagehosts.py
View File

@@ -304,7 +304,7 @@ class TurboimagehostImageExtractor(ImagehostImageExtractor):
pattern = [(r"(?:https?://)?((?:www\.)?turboimagehost\.com/p/(\d+)" pattern = [(r"(?:https?://)?((?:www\.)?turboimagehost\.com/p/(\d+)"
r"/[^/]+\.html)")] r"/[^/]+\.html)")]
test = [("http://www.turboimagehost.com/p/29690902/test--.png.html", { test = [("http://www.turboimagehost.com/p/29690902/test--.png.html", {
"url": "c624dc7784de515342117a2678fee6ecf1032d79", "url": "ada27a4e04f9ffd5ab7cd787f4559d5b3744520b",
"keyword": "a4527f14675e4512ef317ee0401940c711fbe012", "keyword": "a4527f14675e4512ef317ee0401940c711fbe012",
"content": "0c8768055e4e20e7c7259608b67799171b691140", "content": "0c8768055e4e20e7c7259608b67799171b691140",
})] })]

3
gallery_dl/extractor/pinterest.py
View File

@@ -124,7 +124,8 @@ class PinterestPinitExtractor(PinterestExtractor):
def items(self): def items(self):
response = self.session.head(self.url) response = self.session.head(self.url)
location = response.headers.get("Location") location = response.headers.get("Location")
if not location or location == "https://www.pinterest.com": if not location or location in ("https://api.pinterest.com/None",
"https://www.pinterest.com"):
raise exception.NotFoundError("pin") raise exception.NotFoundError("pin")
yield Message.Queue, location yield Message.Queue, location