Merge pull request #33869 from dimagi/smh/lint

Linter

corehq/apps/app_manager/id_strings.py

@@ -205,8 +205,7 @@ def module_locale(module):
 
 @pattern('forms.m%df%d')
 def form_locale(form):
-    return "forms.m{module.id}f{form.id}".format(module=form.get_module(),
-                                                  form=form)
+    return "forms.m{module.id}f{form.id}".format(module=form.get_module(), form=form)
 
 
 @pattern('training.root.title')

corehq/apps/app_manager/tests/test_app_strings.py

@@ -72,9 +72,11 @@ def test_escape_output_value(self):
             ('क्लिक', '<value>क्लिक</value>'),
             ('&#39', '<value>&amp;#39</value>'),
             ('question1 is <output value="/data/question1" vellum:value="#form/question1"/> !',
-             '<value>question1 is &lt;output value="/data/question1" vellum:value="#form/question1"/&gt; !</value>'),
+             '<value>question1 is &lt;output value="/data/question1" '
+             'vellum:value="#form/question1"/&gt; !</value>'),
             ('Here is a ref <output value="/data/no_media"/> with some "trailing" text & that\'s some bad < xml.',
-             '<value>Here is a ref &lt;output value="/data/no_media"/&gt; with some "trailing" text &amp; that\'s some bad &lt; xml.</value>')
+             '<value>Here is a ref &lt;output value="/data/no_media"/&gt; with some "trailing" text &amp; that\'s'
+             ' some bad &lt; xml.</value>')
 
         ]
         for input, expected_output in test_cases:

corehq/apps/translations/app_translations/download.py

@@ -44,8 +44,7 @@ def get_bulk_app_single_sheet_by_name(app, lang, eligible_for_transifex_only=Fal
             rows.append(get_name_menu_media_row(form, sheet_name, lang))
             for label_name_media in get_form_question_label_name_media([lang], form):
                 if (
-                    eligible_for_transifex_only and
-                    checker.is_label_to_skip(form.unique_id, label_name_media[0])
+                    eligible_for_transifex_only and checker.is_label_to_skip(form.unique_id, label_name_media[0])
                 ):
                     continue
                 rows.append(get_question_row(label_name_media, sheet_name))
@@ -106,8 +105,7 @@ def get_bulk_app_sheets_by_name(app, lang=None, eligible_for_transifex_only=Fals
             rows[form_sheet_name] = []
             for label_name_media in get_form_question_label_name_media(langs, form):
                 if (
-                    eligible_for_transifex_only and
-                    checker.is_label_to_skip(form.unique_id, label_name_media[0])
+                    eligible_for_transifex_only and checker.is_label_to_skip(form.unique_id, label_name_media[0])
                 ):
                     continue
                 rows[form_sheet_name].append(label_name_media)
@@ -125,16 +123,11 @@ def get_name_menu_media_row(module_or_form, sheet_name, lang):
             '',  # case_property
             '',  # list_or_detail
             '',  # label
-        ] +
-        get_menu_row(
-            [module_or_form.name.get(lang)],
-            [module_or_form.icon_by_language(lang)],
-            [module_or_form.audio_by_language(lang)]
-        ) +
-        [
-            '',  # video by language
-            module_or_form.unique_id,
-        ]
+        ] + get_menu_row([module_or_form.name.get(lang)],
+                         [module_or_form.icon_by_language(lang)],
+                         [module_or_form.audio_by_language(lang)]
+                         ) + ['',  # video by language
+                              module_or_form.unique_id, ]
     )
 
 
@@ -162,9 +155,7 @@ def get_question_row(question_label_name_media, sheet_name):
             sheet_name,
             '',  # case_property
             '',  # list_or_detail
-        ] +
-        question_label_name_media +
-        ['']  # unique_id
+        ] + question_label_name_media + ['']  # unique_id
     )
 
 
@@ -197,8 +188,8 @@ def get_module_case_list_form_rows(langs, module):
         return []
 
     return [
-        ('case_list_form_label', 'list') +
-        tuple(module.case_list_form.label.get(lang, '') for lang in langs)
+        ('case_list_form_label', 'list') + tuple(module.case_list_form.label.get(lang, '')
+                                                 for lang in langs)
     ]
 
 
@@ -210,8 +201,8 @@ def get_module_case_list_menu_item_rows(langs, module):
         return []
 
     return [
-        ('case_list_menu_item_label', 'list') +
-        tuple(module.case_list.label.get(lang, '') for lang in langs)
+        ('case_list_menu_item_label', 'list') + tuple(module.case_list.label.get(lang, '')
+                                                      for lang in langs)
     ]
 
 
@@ -229,8 +220,8 @@ def get_module_search_command_rows(langs, module, domain):
     ]
     if not toggles.SPLIT_SCREEN_CASE_SEARCH.enabled(domain):
         rows.append(
-            ('search_again_label', 'list')
-            + tuple(module.search_config.search_again_label.label.get(lang, '') for lang in langs),
+            ('search_again_label', 'list') + tuple(module.search_config.search_again_label.label.get(lang, '')
+                                                   for lang in langs),
         )
     return rows
 
@@ -268,15 +259,13 @@ def _get_module_detail_no_items_text(langs, module):
     if not (app.supports_empty_case_list_text):
         return []
     return [
-        ("no_items_text", "list")
-        + tuple(short_detail.no_items_text.get(lang, '') for lang in langs)
+        ("no_items_text", "list") + tuple(short_detail.no_items_text.get(lang, '') for lang in langs)
     ]
 
 
 def get_module_detail_tabs_rows(langs, detail, list_or_detail):
     return [
-        ("Tab {}".format(index), list_or_detail) +
-        tuple(tab.header.get(lang, "") for lang in langs)
+        ("Tab {}".format(index), list_or_detail) + tuple(tab.header.get(lang, "") for lang in langs)
         for index, tab in enumerate(detail.tabs)
     ]
 
@@ -292,14 +281,13 @@ def get_module_detail_fields_rows(langs, detail, list_or_detail):
 
 def get_module_detail_field_row(langs, detail, list_or_detail):
     field_name = detail.field
-    if re.search(r'\benum\b', detail.format):   # enum, conditional-enum, enum-image
+    if re.search(r'\benum\b', detail.format):  # enum, conditional-enum, enum-image
         field_name += " (ID Mapping Text)"
     elif detail.format == "graph":
         field_name += " (graph)"
 
     return (
-        (field_name, list_or_detail) +
-        tuple(detail.header.get(lang, "") for lang in langs)
+        (field_name, list_or_detail) + tuple(detail.header.get(lang, "") for lang in langs)
     )
 
 

corehq/apps/translations/app_translations/upload_form.py

@@ -88,7 +88,7 @@ def update(self, rows):
         # Update the translations
         for lang in self.langs:
             translation_node = self.itext.find("./{f}translation[@lang='%s']" % lang)
-            assert(translation_node.exists())
+            assert translation_node.exists()
 
             for row in rows:
                 if row['label'] in label_ids_to_skip:
@@ -178,8 +178,8 @@ def _add_or_remove_translations(self, lang, row):
             if self.is_multi_sheet and not new_translation:
                 # If the cell corresponding to the label for this question
                 # in this language is empty, fall back to another language
-                for l in self.langs:
-                    key = self._get_col_key(trans_type, l)
+                for language in self.langs:
+                    key = self._get_col_key(trans_type, language)
                     if key not in row:
                         continue
                     fallback = row[key]