Update upstream source from tag 'upstream/1.31.1'

Update to upstream version '1.31.1'
with Debian dir b5d91c25143175f933b1c69c7e82249cd7e145ab

1 files changed, 15 insertions, 14 deletions

diff --git a/gallery_dl/extractor/imgur.py b/gallery_dl/extractor/imgur.py
index 1ac76e0..4755388 100644
--- a/gallery_dl/extractor/imgur.py
+++ b/gallery_dl/extractor/imgur.py
@@ -38,7 +38,7 @@ class ImgurExtractor(Extractor):
 
         image["url"] = url = \
             f"https://i.imgur.com/{image['id']}.{image['ext']}"
-        image["date"] = text.parse_datetime(image["created_at"])
+        image["date"] = self.parse_datetime_iso(image["created_at"])
         image["_http_validate"] = self._validate
         text.nameext_from_url(url, image)
 
@@ -67,7 +67,7 @@ class ImgurImageExtractor(ImgurExtractor):
     subcategory = "image"
     filename_fmt = "{category}_{id}{title:?_//}.{extension}"
     archive_fmt = "{id}"
-    pattern = (BASE_PATTERN + r"/(?!gallery|search)"
+    pattern = (rf"{BASE_PATTERN}/(?!gallery|search)"
                r"(?:r/\w+/)?(?:[^/?#]+-)?(\w{7}|\w{5})[sbtmlh]?")
     example = "https://imgur.com/abcdefg"
 
@@ -83,7 +83,7 @@ class ImgurImageExtractor(ImgurExtractor):
         image.update(image["media"][0])
         del image["media"]
         url = self._prepare(image)
-        yield Message.Directory, image
+        yield Message.Directory, "", image
         yield Message.Url, url, image
 
 
@@ -93,7 +93,7 @@ class ImgurAlbumExtractor(ImgurExtractor):
     directory_fmt = ("{category}", "{album[id]}{album[title]:? - //}")
     filename_fmt = "{category}_{album[id]}_{num:>03}_{id}.{extension}"
     archive_fmt = "{album[id]}_{id}"
-    pattern = BASE_PATTERN + r"/a/(?:[^/?#]+-)?(\w{7}|\w{5})"
+    pattern = rf"{BASE_PATTERN}/a/(?:[^/?#]+-)?(\w{{7}}|\w{{5}})"
     example = "https://imgur.com/a/abcde"
 
     def items(self):
@@ -106,7 +106,7 @@ class ImgurAlbumExtractor(ImgurExtractor):
 
         del album["media"]
         count = len(images)
-        album["date"] = text.parse_datetime(album["created_at"])
+        album["date"] = self.parse_datetime_iso(album["created_at"])
 
         try:
             del album["ad_url"]
@@ -119,14 +119,15 @@ class ImgurAlbumExtractor(ImgurExtractor):
             image["num"] = num
             image["count"] = count
             image["album"] = album
-            yield Message.Directory, image
+            yield Message.Directory, "", image
             yield Message.Url, url, image
 
 
 class ImgurGalleryExtractor(ImgurExtractor):
     """Extractor for imgur galleries"""
     subcategory = "gallery"
-    pattern = BASE_PATTERN + r"/(?:gallery|t/\w+)/(?:[^/?#]+-)?(\w{7}|\w{5})"
+    pattern = (rf"{BASE_PATTERN}/"
+               rf"(?:gallery|t/\w+)/(?:[^/?#]+-)?(\w{{7}}|\w{{5}})")
     example = "https://imgur.com/gallery/abcde"
 
     def items(self):
@@ -142,7 +143,7 @@ class ImgurGalleryExtractor(ImgurExtractor):
 class ImgurUserExtractor(ImgurExtractor):
     """Extractor for all images posted by a user"""
     subcategory = "user"
-    pattern = (BASE_PATTERN + r"/user/(?!me(?:/|$|\?|#))"
+    pattern = (rf"{BASE_PATTERN}/user/(?!me(?:/|$|\?|#))"
                r"([^/?#]+)(?:/posts|/submitted)?/?$")
     example = "https://imgur.com/user/USER"
 
@@ -153,7 +154,7 @@ class ImgurUserExtractor(ImgurExtractor):
 class ImgurFavoriteExtractor(ImgurExtractor):
     """Extractor for a user's favorites"""
     subcategory = "favorite"
-    pattern = BASE_PATTERN + r"/user/([^/?#]+)/favorites/?$"
+    pattern = rf"{BASE_PATTERN}/user/([^/?#]+)/favorites/?$"
     example = "https://imgur.com/user/USER/favorites"
 
     def items(self):
@@ -163,7 +164,7 @@ class ImgurFavoriteExtractor(ImgurExtractor):
 class ImgurFavoriteFolderExtractor(ImgurExtractor):
     """Extractor for a user's favorites folder"""
     subcategory = "favorite-folder"
-    pattern = BASE_PATTERN + r"/user/([^/?#]+)/favorites/folder/(\d+)"
+    pattern = rf"{BASE_PATTERN}/user/([^/?#]+)/favorites/folder/(\d+)"
     example = "https://imgur.com/user/USER/favorites/folder/12345/TITLE"
 
     def __init__(self, match):
@@ -178,7 +179,7 @@ class ImgurFavoriteFolderExtractor(ImgurExtractor):
 class ImgurMeExtractor(ImgurExtractor):
     """Extractor for your personal uploads"""
     subcategory = "me"
-    pattern = BASE_PATTERN + r"/user/me(?:/posts)?(/hidden)?"
+    pattern = rf"{BASE_PATTERN}/user/me(?:/posts)?(/hidden)?"
     example = "https://imgur.com/user/me"
 
     def items(self):
@@ -195,7 +196,7 @@ class ImgurMeExtractor(ImgurExtractor):
 class ImgurSubredditExtractor(ImgurExtractor):
     """Extractor for a subreddits's imgur links"""
     subcategory = "subreddit"
-    pattern = BASE_PATTERN + r"/r/([^/?#]+)/?$"
+    pattern = rf"{BASE_PATTERN}/r/([^/?#]+)/?$"
     example = "https://imgur.com/r/SUBREDDIT"
 
     def items(self):
@@ -205,7 +206,7 @@ class ImgurSubredditExtractor(ImgurExtractor):
 class ImgurTagExtractor(ImgurExtractor):
     """Extractor for imgur tag searches"""
     subcategory = "tag"
-    pattern = BASE_PATTERN + r"/t/([^/?#]+)$"
+    pattern = rf"{BASE_PATTERN}/t/([^/?#]+)$"
     example = "https://imgur.com/t/TAG"
 
     def items(self):
@@ -215,7 +216,7 @@ class ImgurTagExtractor(ImgurExtractor):
 class ImgurSearchExtractor(ImgurExtractor):
     """Extractor for imgur search results"""
     subcategory = "search"
-    pattern = BASE_PATTERN + r"/search(?:/[^?#]+)?/?\?q=([^&#]+)"
+    pattern = rf"{BASE_PATTERN}/search(?:/[^?#]+)?/?\?q=([^&#]+)"
     example = "https://imgur.com/search?q=UERY"
 
     def items(self):