Noissue - Adapt best practices for trailing commas (cms)

cms/bin/translate.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 27 matching lines @@
 
     def __init__(self, api_key, project_name):
         self.api_key = api_key
         self.project_name = project_name
         self.connection = urllib3.connection_from_url('https://api.crowdin.com/')
 
     def raw_request(self, request_method, api_endpoint, query_params=(), **kwargs):
         url = '/api/project/%s/%s?%s' % (
             urllib.quote(self.project_name),
             urllib.quote(api_endpoint),
-            urllib.urlencode((('key', self.api_key),) + query_params)
+            urllib.urlencode((('key', self.api_key),) + query_params),
         )
         try:
             response = self.connection.request(
                 request_method, str(url), **kwargs

[Sebastian Noack, 2018/04/19 13:51:19]

Apparently flake8-commas insist on comma after varargs which is a syntax error.

[Sebastian Noack, 2018/04/19 14:23:34]

It turned out we can just ignore C815 to avoid that.

             )
         except urllib3.exceptions.HTTPError:
             logger.error('Connection to API endpoint %s failed', url)
             raise
         if response.status < 200 or response.status >= 300:
             logger.error('API call to %s failed:\n%s', url, response.data)
             raise urllib3.exceptions.HTTPError(response.status)
         return response
 
     def request(self, request_method, api_endpoint, data=None, files=None):
         fields = []
         if data:
             for name, value in data.iteritems():
                 if isinstance(value, basestring):
                     fields.append((name, value))
                 else:
                     fields.extend((name + '[]', v) for v in value)
         if files:
             fields.extend(('files[%s]' % f[0], f) for f in files)
 
         response = self.raw_request(
             request_method, api_endpoint, (('json', '1'),),
-            fields=fields, preload_content=False
+            fields=fields, preload_content=False,
         )
 
         try:
             return json.load(response)
         except ValueError:
             logger.error('Invalid response returned by API endpoint %s', url)
             raise
 
 
 def grouper(iterable, n):
@@ skipping 55 matching lines @@
             required_locales[locale] = crowdin_locale
         else:
             logger.warning("Ignoring locale '%s', which Crowdin doesn't support",
                            locale)
 
     required_crowdin_locales = set(required_locales.values())
     if not required_crowdin_locales.issubset(enabled_locales):
         logger.info('Enabling the required locales for the Crowdin project...')
         crowdin_api.request(
             'POST', 'edit-project',
-            data={'languages': enabled_locales | required_crowdin_locales}
+            data={'languages': enabled_locales | required_crowdin_locales},
         )
 
     return required_locales
 
 
 def list_remote_files(project_info):
     def parse_file_node(node, path=''):
         if node['node_type'] == 'file':
             remote_files.add(path + node['name'])
         elif node['node_type'] == 'directory':
@@ skipping 102 matching lines @@
                     os.remove(os.path.join(root, f))
         # Then extract the new ones in place
         for member in archive.namelist():
             path, file_name = posixpath.split(member)
             ext = posixpath.splitext(file_name)[1]
             path_parts = path.split(posixpath.sep)
             locale, file_path = path_parts[0], path_parts[1:]
             if ext.lower() == '.json' and locale in inverted_required_locales:
                 output_path = os.path.join(
                     locale_path, inverted_required_locales[locale],
-                    *file_path + [file_name]
+                    *file_path + [file_name],
                 )
                 with archive.open(member) as source_file:
                     locale_file_contents = json.load(source_file)
                     if len(locale_file_contents):
                         with codecs.open(output_path, 'wb', 'utf-8') as target_file:
                             json.dump(locale_file_contents, target_file, ensure_ascii=False,
                                       sort_keys=True, indent=2, separators=(',', ': '))
 
 
 def crowdin_sync(source_dir, crowdin_api_key):
@@ skipping 44 matching lines @@
 if __name__ == '__main__':
     if len(sys.argv) < 3:
         print >>sys.stderr, 'Usage: python -m cms.bin.translate www_directory crowdin_project_api_key [logging_level]'
         sys.exit(1)
 
     logging.basicConfig()
     logger.setLevel(sys.argv[3] if len(sys.argv) > 3 else logging.INFO)
 
     source_dir, crowdin_api_key = sys.argv[1:3]
     crowdin_sync(source_dir, crowdin_api_key)