Issue 5844 - Remove redundant parentheses in sitescripts and abpsembly

sitescripts/templateFilters.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present 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
@@ skipping 105 matching lines @@
     return Markup(value)
 
 
 def urlencode(value):
     return urllib.quote(value.encode('utf-8'), '')
 
 
 def subscriptionSort(value, prioritizeRecommended=True):
     value = value[:]  # create a copy of the list
     if prioritizeRecommended:
-        value.sort(lambda a, b: (
-            cmp(a.type, b.type) or
-            cmp(a.deprecated, b.deprecated) or
-            cmp(b.catchall, a.catchall) or
-            cmp(b.recommendation != None, a.recommendation != None) or
-            cmp(a.name.lower(), b.name.lower())
-        ))
+        value.sort(lambda a, b:
+                   cmp(a.type, b.type) or
+                   cmp(a.deprecated, b.deprecated) or
+                   cmp(b.catchall, a.catchall) or
+                   cmp(b.recommendation != None, a.recommendation != None) or
+                   cmp(a.name.lower(), b.name.lower())
+                   )

[Sebastian Noack, 2018/01/17 01:43:51]

If you indent code without a newline after the opening parenthesis, please don't
put the closing parenthesis on a new line either:

  value.sort(lambda a, b:
             ...
             ...)

Alternatively, following indention would be acceptable, and compliant with
flake8, too, and while it requires 2 more lines it looks a bit more structured:

  value.sort(
      lambda a, b:
          ...
  )

FWIW, one could also argue that neither is an improvement to the original code.
However, if we just remove the parenthesis, without changing the indentation,
we'd get an E128. Not sure if it's worth to add a (potentially complex)
exception to the A111 rule, though. What would the exception be, anyway?

[Vasily Kuznetsov, 2018/01/18 10:46:07]

Just for the record, I prefer Sebastian's second version. I also think it's more
readable than the original code.

[rosie, 2018/01/25 16:13:48]

Yeah, the second version also seems more readable to me.
Done.

     else:
-        value.sort(lambda a, b: (
-            cmp(a.type, b.type) or
-            cmp(a.deprecated, b.deprecated) or
-            cmp(a.name.lower(), b.name.lower())
-        ))
+        value.sort(lambda a, b:
+                   cmp(a.type, b.type) or
+                   cmp(a.deprecated, b.deprecated) or
+                   cmp(a.name.lower(), b.name.lower())
+                   )
     return value
 
 
 def formatmime(text):
     # See http://bugs.python.org/issue5871 (not really fixed), Header() will
     # happily accept non-printable characters including newlines. Make sure to
     # remove them.
     text = re.sub(r'[\x00-\x1F]', '', text)
     return email.header.Header(text).encode()
 
@@ skipping 50 matching lines @@
     'subscriptionSort': subscriptionSort,
     'mime': formatmime,
     'emailaddr': email.utils.formataddr,
     'ljust': ljust,
     'rjust': rjust,
     'ltruncate': ltruncate,
     'weekday': formatweekday,
     'bytes': formatbytes,
     'json': toJSON,
 }