Update formatting commands in package.json and pyproject.toml; refactor indentation in Python scripts for consistency

package.json

@@ -17,8 +17,8 @@
     "update-ff": "python3 scripts/update_ff.py",
     "update-ff:raw": "surfer update",
     "update-newtab": "python3 scripts/update_newtab.py",
-    "pretty": "prettier . --write && autopep8 -r scripts/ --in-place",
+    "pretty": "prettier . --write && autopep8 -r --in-place scripts/ src/",
-    "lint": "npx prettier . --check && autopep8 --diff -r scripts/",
+    "lint": "npx prettier . --check && autopep8 --diff scripts/ src/",
     "prepare": "husky"
   },
   "repository": {

pyproject.toml

@@ -1,6 +1,5 @@
 [tool.autopep8]
 max_line_length = 120
-ignore = "E501,W6"  # or ["E501", "W6"]
 recursive = true
 aggressive = 3
 indent_size = 2

scripts/check-rc-response.py

@@ -72,5 +72,6 @@ def main() -> int:
   print(f"Current version: {current_version}, RC version: {rc_response}")
   return 1
 
+
 if __name__ == "__main__":
   sys.exit(main())

src/browser/base/content/zen-avatars/fetch-all-avatars.py

@@ -15,51 +15,51 @@ COLORS = {
 
 
 def random_string(length):
-    return "".join(random.choices("abcdefghijklmnopqrstuvwxyz", k=length))
+  return "".join(random.choices("abcdefghijklmnopqrstuvwxyz", k=length))
 
 
 def generate_list_names():
-    names = []
+  names = []
-    for i in range(1, 101):
+  for i in range(1, 101):
-        names.append(random_string(random.randint(5, 10)))
+    names.append(random_string(random.randint(5, 10)))
-    return names
+  return names
 
 
 def write_jar_file(jar_file):
-    with open("jar.inc.mn", "w") as f:
+  with open("jar.inc.mn", "w") as f:
-        f.write(jar_file)
+    f.write(jar_file)
 
 
 def fetch_all_avatars():
-    names = generate_list_names()
+  names = generate_list_names()
-    jar_file = ""
+  jar_file = ""
-    for theme in COLORS:
+  for theme in COLORS:
-        for [i, name] in enumerate(names):
+    for [i, name] in enumerate(names):
-            url = URL.format(name, ",".join(COLORS[theme]))
+      url = URL.format(name, ",".join(COLORS[theme]))
-            response = requests.get(url)
+      response = requests.get(url)
-            with open(f"avatar-{i}-{theme}.svg", "w") as f:
+      with open(f"avatar-{i}-{theme}.svg", "w") as f:
-                f.write(response.text)
+        f.write(response.text)
-            jar_file += JAR_ENTRY_TEMPLATE.format(f"avatar-{i}-{theme}.svg") + "\n"
+      jar_file += JAR_ENTRY_TEMPLATE.format(f"avatar-{i}-{theme}.svg") + "\n"
-            print(
+      print(
-                f"SUCCESS: Fetched 'avatar-{i}-{theme}.svg' for name '{name}' with theme '{theme}'"
+          f"SUCCESS: Fetched 'avatar-{i}-{theme}.svg' for name '{name}' with theme '{theme}'"
-            )
+      )
-    write_jar_file(jar_file)
+  write_jar_file(jar_file)
 
 
 def clear_all_avatars():
-    for file in os.listdir():
+  for file in os.listdir():
-        if file.startswith("avatar-") and file.endswith(".svg"):
+    if file.startswith("avatar-") and file.endswith(".svg"):
-            os.remove(file)
+      os.remove(file)
-            print(f"SUCCESS: Removed '{file}'")
+      print(f"SUCCESS: Removed '{file}'")
 
 
 def main():
-    if not os.getcwd().endswith("zen-avatars"):
+  if not os.getcwd().endswith("zen-avatars"):
-        print("ERROR: Please run this script from the 'zen-avatars' directory")
+    print("ERROR: Please run this script from the 'zen-avatars' directory")
-        return
+    return
-    clear_all_avatars()
+  clear_all_avatars()
-    fetch_all_avatars()
+  fetch_all_avatars()
 
 
 if __name__ == "__main__":
-    main()
+  main()