merge #6077: [flickr] fix bug introduced in e92a9ae

mikf · Aug 25, 2024 · 65cae11 · 65cae11
2 parents 46c3971 + 47e7be3
commit 65cae11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/gallery_dl/extractor/flickr.py b/gallery_dl/extractor/flickr.py
@@ -519,7 +519,7 @@ def _extract_metadata(self, photo):
 
         if self.contexts:
             try:
-                photo.update(self.api.photos_getAllContexts(photo["id"]))
+                photo.update(self.photos_getAllContexts(photo["id"]))
             except Exception as exc:
                 self.log.warning(
                     "Unable to retrieve 'contexts' data for %s (%s: %s)",

diff --git a/test/results/flickr.py b/test/results/flickr.py
@@ -13,20 +13,28 @@
     "#url"     : "https://www.flickr.com/photos/departingyyz/16089302239",
     "#category": ("", "flickr", "image"),
     "#class"   : flickr.FlickrImageExtractor,
+    "#options" : {
+        "contexts": True,
+        "exif": True,
+    },
     "#pattern"     : flickr.FlickrImageExtractor.pattern,
     "#sha1_content": [
         "3133006c6d657fe54cf7d4c46b82abbcb0efaf9f",
         "0821a28ee46386e85b02b67cf2720063440a228c",
     ],
 
+    "camera"     : "Sony ILCE-7",
     "comments"   : int,
     "description": str,
+    "exif"       : list,
     "extension"  : "jpg",
     "filename"   : "16089302239_de18cd8017_b",
     "id"         : 16089302239,
     "height"     : 683,
     "label"      : "Large",
     "media"      : "photo",
+    "pool"       : list,
+    "set"        : list,
     "url"        : str,
     "views"      : int,
     "width"      : 1024,