From a1fa4b43b07f09a56feb916e02a923522bf0ae20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Mon, 9 Apr 2018 16:08:08 +0200
Subject: [PATCH] Revert "[tumblr] add option to sort photosets by upload
 order"

This reverts commit 4a26ae32df4cadee82959ae390a815dd7685c07e.
---
 docs/configuration.rst         | 12 ------------
 docs/gallery-dl.conf           |  3 +--
 gallery_dl/extractor/tumblr.py | 13 -------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 191e8255..b80938ae 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -587,18 +587,6 @@ Description Extract images from reblogged posts.
 =========== =====
 
 
-extractor.tumblr.sort
----------------------
-=========== =====
-Type        ``bool``
-Default     ``false``
-Description Sort photos of a Photoset according to their original upload order.
-
-            Otherwise these photos will be returned in the order the blog owner
-            arranged them in.
-=========== =====
-
-
 extractor.tumblr.posts
 ----------------------
 =========== =====
diff --git a/docs/gallery-dl.conf b/docs/gallery-dl.conf
index d48087cb..baf40388 100644
--- a/docs/gallery-dl.conf
+++ b/docs/gallery-dl.conf
@@ -102,8 +102,7 @@
             "external": false,
             "inline": false,
             "posts": "photo",
-            "reblogs": true,
-            "sort": false
+            "reblogs": true
         }
     },
 
diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py
index f435b738..0168c889 100644
--- a/gallery_dl/extractor/tumblr.py
+++ b/gallery_dl/extractor/tumblr.py
@@ -63,7 +63,6 @@ class TumblrExtractor(Extractor):
         self.inline = self.config("inline", False)
         self.reblogs = self.config("reblogs", True)
         self.external = self.config("external", False)
-        self.sort_photos = self.config("sort", False)
 
         if len(self.types) == 1:
             self.api.posts_type = next(iter(self.types))
@@ -96,9 +95,6 @@ class TumblrExtractor(Extractor):
                 photos = post["photos"]
                 del post["photos"]
 
-                if self.sort_photos and len(photos) > 1:
-                    photos.sort(key=self._get_tumblr_offset)
-
                 for photo in photos:
                     post["photo"] = photo
                     photo.update(photo["original_size"])
@@ -165,15 +161,6 @@ class TumblrExtractor(Extractor):
 
         return Message.Urllist, _original_image(url), post
 
-    @staticmethod
-    def _get_tumblr_offset(photo):
-        """Return the offset embedded in a photo's URL"""
-        return util.safe_int(
-            photo["original_size"]["url"]
-            .rpartition("_")[0]
-            .rpartition("o")[2]
-        )
-
 
 class TumblrUserExtractor(TumblrExtractor):
     """Extractor for all images from a tumblr-user"""