Issue 5844 - Remove redundant parentheses in sitescripts and abpsembly

sitescripts/subscriptions/subscriptionParser.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 134 matching lines @@
                     regexp = re.compile(r'\s*\[((?:\w+,)*\w+)\]$')
                     match = re.search(regexp, value)
                     if match:
                         value = re.sub(regexp, r'', value)
                         for keyword in match.group(1).split(','):
                             keyword = keyword.lower()
                             if keyword in keywords:
                                 keywords[keyword] = True
                             else:
                                 warn('Unknown keyword %s given for attribute %s in %s' % (keyword, key, path))
-                    (name, url) = (self.name, value)
+                    name, url = (self.name, value)

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

I wonder whether we should omit the parantheses when creating the tuple as well,
here. The rule allows the optional parantheses when creating tuples (for
readability), but not when unpacking tuples. However, if the same line does
both, it looks somewhat inconsistent.

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

If parentheses are not needed for line breaking (and they should not be in
constructions like this), my preference would be to omit parentheses on both
sides. More consistent and reads a bit better. I don't feel very strong about
this though.

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

Done.

[Sebastian Noack, 2018/01/25 18:15:00]

Mind also doing the same change below?

[rosie, 2018/01/25 19:03:39]

Done.

                     if key == 'variant':
                         match = re.search(r'(.+?)\s+(\S+)$', value)
                         if match:
-                            (name, url) = (match.group(1), match.group(2))
+                            name, url = (match.group(1), match.group(2))
                         else:
-                            warn('Invalid variant format in %s, no name given?' % (path))
+                            warn('Invalid variant format in %s, no name given?' % path)
                     if not _validate_URL(url):
                         warn('Invalid list URL %s given in %s' % (url, path))
                     self.variants.append([name, url, keywords['complete']])
                     if keywords['recommendation']:
                         self._data['recommendation'] = self._data['variants'][-1]
                         self._data['catchall'] = keywords['catchall']
 
                 elif key == 'deprecated' or key == 'unavailable':
                     self._data[key] = True
 
@@ skipping 20 matching lines @@
         for group in mandatory:
             found = False
             for key in group:
                 if self._data[key] != None:
                     found = True
             if not found:
                 str = ', '.join(group)
                 warn('None of the attributes %s present in %s' % (str, path))
 
         if len(self.variants) == 0:
-            warn('No list locations given in %s' % (path))
+            warn('No list locations given in %s' % path)
         if self.type not in ('ads', 'anti-adblock', 'other', 'malware', 'social', 'privacy'):
-            warn('Unknown type given in %s' % (path))
+            warn('Unknown type given in %s' % path)
         if self.digest != 'daily' and self.digest != 'weekly':
-            warn('Unknown digest frequency given in %s' % (path))
+            warn('Unknown digest frequency given in %s' % path)
         if not self.digestDay[0:3].lower() in weekdays:
-            warn('Unknown digest day given in %s' % (path))
+            warn('Unknown digest day given in %s' % path)
             self.digestDay = 'wed'
         self.digestDay = weekdays[self.digestDay[0:3].lower()]
         if self.recommendation is not None and self.type == 'ads' and not (self.languages and self.languages.strip()):
-            warn('Recommendation without languages in %s' % (path))
+            warn('Recommendation without languages in %s' % path)
         if len(self.supplements) == 0:
             for [name, url, complete] in self.variants:
                 if complete:
-                    warn('Variant marked as complete for non-supplemental subscription in %s' % (path))
+                    warn('Variant marked as complete for non-supplemental subscription in %s' % path)
                     break
 
         self.variants.sort(key=lambda variant: (self.recommendation == variant) * 2 + variant[2], reverse=True)
 
 
 def parse_file(path, data):
     return Subscription(path, data)
 
 
 def calculate_supplemented(lists):
@@ skipping 21 matching lines @@
     data = subprocess.check_output(['hg', 'archive', '-R', repo, '-r', 'default', '-t', 'tar', '-I', os.path.join(repo, '*.subscription'), '-'])
 
     result = {}
     with tarfile.open(mode='r:', fileobj=StringIO(data)) as archive:
         for fileinfo in archive:
             filedata = parse_file(fileinfo.name, codecs.getreader('utf8')(archive.extractfile(fileinfo)))
             if filedata.unavailable:
                 continue
 
             if filedata.name in result:
-                warn('Name %s is claimed by multiple files' % (filedata.name))
+                warn('Name %s is claimed by multiple files' % filedata.name)
             result[filedata.name] = filedata
 
     calculate_supplemented(result)
     return result
 
 
 def getFallbackData():
     repo = os.path.abspath(get_config().get('subscriptions', 'repository'))
     redirectdata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'redirects')])
     gonedata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'gone')])
     return (redirectdata, gonedata)
 
 
 def _validate_URL(url):
     parse_result = urlparse(url)
     return parse_result.scheme in ('http', 'https') and parse_result.netloc != ''