]> granicus.if.org Git - esp-idf/commitdiff
tools: correct the coding style of check_python_dependencies.py
authorRoland Dobai <dobai.roland@gmail.com>
Fri, 30 Nov 2018 12:31:44 +0000 (13:31 +0100)
committerRoland Dobai <dobai.roland@gmail.com>
Fri, 30 Nov 2018 12:43:28 +0000 (13:43 +0100)
.flake8
tools/check_python_dependencies.py

diff --git a/.flake8 b/.flake8
index fd3fec31bb17ff2ab83c2ddb1ac47a47bdd25f4e..ace0388168bb65dc2837a226308ea952dccd185b 100644 (file)
--- a/.flake8
+++ b/.flake8
@@ -212,7 +212,6 @@ exclude =
         examples/system/ota/otatool/example_test.py,
         examples/wifi/iperf/iperf_test.py,
         examples/wifi/iperf/test_report.py,
-        tools/check_python_dependencies.py,
         tools/ci/apply_bot_filter.py,
         tools/cmake/convert_to_cmake.py,
         tools/esp_app_trace/apptrace_proc.py,
index 396d52cc90851ff69feca02b16e76d36daf49c20..7922cd8980f2462122be9aa29f6cfe100f67f880 100755 (executable)
@@ -19,12 +19,13 @@ import sys
 import argparse
 try:
     import pkg_resources
-except:
+except Exception:
     print('pkg_resources cannot be imported probably because the pip package is not installed and/or using a '
           'legacy Python interpreter. Please refer to the Get Started section of the ESP-IDF Programming Guide for '
-           'setting up the required packages.')
+          'setting up the required packages.')
     sys.exit(1)
 
+
 def escape_backslash(path):
     if sys.platform == "win32":
         # escaped backslashes are necessary in order to be able to copy-paste the printed path
@@ -32,13 +33,14 @@ def escape_backslash(path):
     else:
         return path
 
+
 if __name__ == "__main__":
     idf_path = os.getenv("IDF_PATH")
 
     parser = argparse.ArgumentParser(description='ESP32 Python package dependency checker')
     parser.add_argument('--requirements', '-r',
-            help='Path to the requrements file',
-            default=os.path.join(idf_path, 'requirements.txt'))
+                        help='Path to the requrements file',
+                        default=os.path.join(idf_path, 'requirements.txt'))
     args = parser.parse_args()
 
     # Special case for MINGW32 Python, needs some packages
@@ -48,13 +50,13 @@ if __name__ == "__main__":
        "/mingw32/bin/python" in sys.executable:
         failed = False
         try:
-            import cryptography
+            import cryptography # noqa: intentionally not used - imported for testing its availability
         except ImportError:
             print("Please run the following command to install MSYS2's MINGW Python cryptography package:")
             print("pacman -Sy mingw-w64-i686-python%d-cryptography" % (sys.version_info[0],))
             failed = True
         try:
-            import setuptools
+            import setuptools # noqa: intentionally not used - imported for testing its availability
         except ImportError:
             print("Please run the following command to install MSYS2's MINGW Python setuptools package:")
             print("pacman -Sy mingw-w64-i686-python%d-setuptools" % (sys.version_info[0],))
@@ -68,7 +70,7 @@ if __name__ == "__main__":
             line = line.strip()
             try:
                 pkg_resources.require(line)
-            except:
+            except Exception:
                 not_satisfied.append(line)
 
     if len(not_satisfied) > 0: