Ver código fonte

Merge branch 'bugfix/python_lint_v3.3' into 'release/v3.3'

tools: fix python lint (v3.3)

See merge request espressif/esp-idf!9328
Anton Maklakov 5 anos atrás
pai
commit
f0b4c08e77

+ 8 - 5
docs/en/conf.py

@@ -6,14 +6,17 @@
 
 # Importing conf_common adds all the non-language-specific
 # parts to this conf module
-import sys
-import os
-sys.path.insert(0, os.path.abspath('..'))
-from conf_common import *  # noqa: F401, F403 - need to make available everything from common
+try:
+    from conf_common import *  # noqa: F403,F401
+except ImportError:
+    import sys
+    import os
+    sys.path.insert(0, os.path.abspath('..'))
+    from conf_common import *  # noqa: F403,F401
 
 # General information about the project.
 project = u'ESP-IDF Programming Guide'
-copyright = u'2016 - 2019, Espressif Systems (Shanghai) CO., LTD'
+copyright = u'2016 - 2020, Espressif Systems (Shanghai) CO., LTD'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

+ 8 - 5
docs/zh_CN/conf.py

@@ -6,14 +6,17 @@
 
 # Importing conf_common adds all the non-language-specific
 # parts to this conf module
-import sys
-import os
-sys.path.insert(0, os.path.abspath('..'))
-from conf_common import *  # noqa: F401, F403 - need to make available everything from common
+try:
+    from conf_common import *  # noqa: F403,F401
+except ImportError:
+    import sys
+    import os
+    sys.path.insert(0, os.path.abspath('..'))
+    from conf_common import *  # noqa: F403,F401
 
 # General information about the project.
 project = u'ESP-IDF 编程指南'
-copyright = u'2016 - 2019 乐鑫信息科技(上海)股份有限公司'
+copyright = u'2016 - 2020 乐鑫信息科技(上海)股份有限公司'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

+ 2 - 0
examples/protocols/http_server/advanced_tests/http_server_advanced_test.py

@@ -49,6 +49,8 @@ client = Utility.load_source("client", expath + "/scripts/test.py")
 # of large HTTP packets and malformed requests, running multiple parallel sessions, etc.
 # It is advised that all these tests be run locally, when making changes or adding new
 # features to this component.
+
+
 @IDF.idf_example_test(env_tag="Example_WIFI")
 def test_examples_protocol_http_server_advanced(env, extra_data):
     # Acquire DUT

+ 1 - 1
tools/kconfig_new/test/test_confserver.py

@@ -13,7 +13,7 @@ PROTOCOL_VERSIONS = [1, 2]
 
 def parse_testcases(version):
     with open("testcases_v%d.txt" % version, "r") as f:
-        cases = [l for l in f.readlines() if len(l.strip()) > 0]
+        cases = [line for line in f.readlines() if len(line.strip()) > 0]
     # Each 3 lines in the file should be formatted as:
     # * Description of the test change
     # * JSON "changes" to send to the server