Issue 1170 - [adblockplus.org Anwiki to CMS migration] Migrate content

filters/subscription_sort.py

-def subscription_sort(value, prioritizeRecommended=True):
-  value = value[:]  # create a copy of the list
-  if prioritizeRecommended:
-    value.sort(lambda a, b: (
-        cmp(a.get("type"), b.get("type")) or
-        cmp(a.get("deprecated"), b.get("deprecated")) or
-        cmp(b.get("catchall"), a.get("catchall")) or
-        cmp(b.get("recommendation") != None, a.get("recommendation") != None) or
-        cmp(a.get("name").lower(), b.get("name").lower())
+# This file is part of the Adblock Plus website,
+# Copyright (C) 2006-2015 Eyeo GmbH
+#
+# Adblock Plus is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# Adblock Plus is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+
+def subscription_sort(value, prioritize_recommended=True):
+  if prioritize_recommended:
+    return sorted(value, lambda a, b: (
+      cmp(a.type, b.type) or
+      cmp(a.deprecated, b.deprecated) or
+      cmp(b.catchall, a.catchall) or
+      cmp(b.recommendation is not None, a.recommendation is not None) or
+      cmp(a.name.lower(), b.name.lower())
     ))
   else:
-    value.sort(lambda a, b: (
-        cmp(a.get("type"), b.get("type")) or
-        cmp(a.get("deprecated"), b.get("deprecated")) or
-        cmp(a.get("name").lower(), b.get("name").lower())
+    return sorted(value, lambda a, b: (
+      cmp(a.type, b.type) or
+      cmp(a.deprecated, b.deprecated) or
+      cmp(a.name.lower(), b.name.lower())
     ))
-  return value