chore: add make format, improve make lint_python3 (#269)

* chore: more lint fixes

* chore: add `make format`, improve `make lint_python3`

Author: ashishb

Makefile

@@ -6,7 +6,7 @@ documentation:
 	pandoc --from=markdown --to=rst --output=docs/README.rst README.md && cd docs && make html
 
 clean:
-	rm -rf build/ dist/  # Cleanup build dir
+	rm -rf dist/  # Cleanup build dir
 
 setup:
 	brew install pandoc sphinx-doc uv
@@ -25,19 +25,36 @@ release_production: documentation
 lint_markdown:
 	mdl -r ~MD013,~MD029,~MD033 README.md
 
+format:
+	uv run autoflake --in-place -r --remove-all-unused-imports --remove-unused-variables adbe
+	# See full error code list at https://pypi.org/project/autopep8/#features
+	uv run autopep8 --recursive --in-place --select W292,W293,W391,W504,E121,E122,E123,E126,E128,E129,E131,E202,E225,E226,E241,E301,E302,E303,E704,E731 adbe
+	uv run ruff check --config pyproject.toml --fix adbe
+	uv run isort --line-length 88 --skip-gitignore adbe
+	uv run isort --line-length 88 --skip-gitignore tests
+
 lint_python3:
-# E0602 is due to undefined variable unicode which is defined only for Python 2
-# W0511 is fixme due to TODOs in the code.
-# adbe/adbe.py:756:8: W0601: Global variable 'screen_record_file_path_on_device' undefined at the module level (global-variable-undefined)
-# adbe/adbe.py:764:8: W0601: Global variable 'screen_record_file_path_on_device' undefined at the module level (global-variable-undefined)
-# adbe/adbe.py:752:4: W0621: Redefining name 'screen_record_file_path_on_device' from outer scope (line 759) (redefined-outer-name)
-# C0111: Missing function docstring (missing-docstring)
+	uv run -- autoflake --check-diff -r --quiet --remove-all-unused-imports --remove-unused-variables adbe
+	# Fail if there are Python syntax errors or undefined names
+	uv run -- flake8 adbe --count --select=E9,F63,F7,F82 --show-source --statistics
+	# W503 has been deprecated in favor of W504 - https://www.flake8rules.com/rules/W503.html
+	uv run -- flake8 adbe --count --show-source --statistics --max-line-length=88 --ignore=E501,W503
+	# Config file is specified for brevity
+	uv run ruff check --config pyproject.toml adbe
+	# Same line length as Black
+	uv run isort --check --diff --line-length 88 --skip-gitignore .
+	# E0602 is due to undefined variable unicode which is defined only for Python 2
+	# W0511 is fixme due to TODOs in the code.
+	# adbe/adbe.py:756:8: W0601: Global variable 'screen_record_file_path_on_device' undefined at the module level (global-variable-undefined)
+	# adbe/adbe.py:764:8: W0601: Global variable 'screen_record_file_path_on_device' undefined at the module level (global-variable-undefined)
+	# adbe/adbe.py:752:4: W0621: Redefining name 'screen_record_file_path_on_device' from outer scope (line 759) (redefined-outer-name)
+	# C0111: Missing function docstring (missing-docstring)
 	uv run -- pylint --disable=C0103,C0111,C0209,W1514 release.py
 	uv run -- pylint adbe/*.py tests/*.py --disable=R0123,R0911,R0912,R0914,R0915,R1705,R1710,C0103,C0111,C0209,C0301,C0302,C1801,W0511,W0621,W0601,W0602,W0603
-	uv run -- flake8 adbe --count --ignore=F401,E126,E501,W504 --show-source --statistics
+	uv run -- flake8 adbe --count --ignore=F401,E126,E501,W503 --show-source --statistics
 	# Default complexity limit is 10
 	# Default line length limit is 127
-	uv run -- flake8 adbe --count --exit-zero --ignore=F401,E126,E501,W504 --max-complexity=13 --max-line-length=127 --statistics
+	uv run -- flake8 adbe --count --exit-zero --ignore=F401,E126,E501,W503 --max-complexity=13 --max-line-length=127 --statistics
 
 # To run a single test, for example, test_file_move3, try this
 # python3 -m pytest -v tests/adbe_tests.py -k test_file_move3

adbe/adb_enhanced.py

@@ -441,9 +441,9 @@ def _get_device_serials() -> [str]:
         if "unauthorized" in device_info:
             device_info = ' '.join(device_info.split()[1:])
             print_error(
-                ('Unlock Device "%s" and give USB debugging access to ' +
-                 'this PC/Laptop by unlocking and reconnecting ' +
-                 'the device. More info about this device: "%s"\n') % (
+                ('Unlock Device "%s" and give USB debugging access to '
+                 + 'this PC/Laptop by unlocking and reconnecting '
+                 + 'the device. More info about this device: "%s"\n') % (
                     device_serial, device_info))
         else:
             device_serials.append(device_serial)
@@ -626,8 +626,8 @@ def dump_screenrecord(filepath):
 
     # I have tested that on API 23 and above this works. Till Api 22, on emulator, it does not.
     if api_version < 23 and _is_emulator():
-        print_error_and_exit("screenrecord is not supported on emulator below API 23\n" +
-                             "Source: https://issuetracker.google.com/issues/36982354")
+        print_error_and_exit("screenrecord is not supported on emulator below API 23\n"
+                             + "Source: https://issuetracker.google.com/issues/36982354")
 
     original_sigint_handler = None
 
@@ -1514,10 +1514,10 @@ def _get_permissions_info_above_api_23(app_info_dump: str):
         elif app_info_dump.find(denied_pattern) >= 0:
             runtime_denied_permissions.append(permission)
     runtime_not_granted_permissions = list(filter(
-        lambda p: p not in runtime_granted_permissions and
-        p not in runtime_denied_permissions and
-        p not in install_time_granted_permissions and
-        p not in install_time_denied_permissions, requested_permissions))
+        lambda p: p not in runtime_granted_permissions
+        and p not in runtime_denied_permissions
+        and p not in install_time_granted_permissions
+        and p not in install_time_denied_permissions, requested_permissions))
 
     permissions_info_msg = ''
     permissions_info_msg += '\nPermissions:\n\n'
@@ -1917,9 +1917,9 @@ def print_notifications():
         notification_actions = []
         action_strings = re.findall(r"actions=\{(.*?)\n\}", output_for_this_notification, re.MULTILINE | re.DOTALL)
         if len(action_strings) > 0 and (
-                i + 1 >= len(notification_records) or
-                output_for_this_notification.find(action_strings[0]) >
-                output_for_this_notification.find(notification_records[i + 1])):
+                i + 1 >= len(notification_records)
+                or output_for_this_notification.find(action_strings[0])
+                > output_for_this_notification.find(notification_records[i + 1])):
             for actions in action_strings[0].split('\n'):
                 notification_actions += re.findall(r"\".*?\"", actions)
 

adbe/main.py

@@ -360,9 +360,9 @@ def _using_python2():
 
 
 def _fail_with_python2_warning():
-    msg = ('You are using Python 2\nADB-enhanced no longer supports Python 2.\n' +
-           'Install Python 3 and then re-install this tool using\n' +
-           '\"sudo pip uninstall adb-enhanced && sudo pip3 install adb-enhanced\"')
+    msg = ('You are using Python 2\nADB-enhanced no longer supports Python 2.\n'
+           + 'Install Python 3 and then re-install this tool using\n'
+           + '\"sudo pip uninstall adb-enhanced && sudo pip3 install adb-enhanced\"')
     print_error_and_exit(msg)
 
 

tests/adbe_tests.py

@@ -1,9 +1,10 @@
 import functools
+import os
 import re
 import subprocess
 import sys
-import os
 import time
+
 import pytest
 
 _SETTINGS_CMD_VERSION = 19

tests/conftest.py

@@ -1,5 +1,6 @@
 import pytest
 
+
 def pytest_addoption(parser):
     parser.addoption("--testpythoninstallation", action="store")