From 9b9502451a37b5c52c3e4a29f883ec047aecad97 Mon Sep 17 00:00:00 2001
From: morris <maoshengrong@espressif.com>
Date: Wed, 24 Jun 2020 10:47:15 +0800
Subject: [PATCH] tools: fix python lint

---
 docs/en/conf.py                                     | 13 ++++++++-----
 docs/zh_CN/conf.py                                  | 13 ++++++++-----
 .../advanced_tests/http_server_advanced_test.py     |  2 ++
 tools/kconfig_new/test/test_confserver.py           |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/docs/en/conf.py b/docs/en/conf.py
index 918bf8b0f..cb77736dd 100644
--- a/docs/en/conf.py
+++ b/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.
diff --git a/docs/zh_CN/conf.py b/docs/zh_CN/conf.py
index 6e3c230d8..567585ffb 100644
--- a/docs/zh_CN/conf.py
+++ b/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.
diff --git a/examples/protocols/http_server/advanced_tests/http_server_advanced_test.py b/examples/protocols/http_server/advanced_tests/http_server_advanced_test.py
index 24ae36300..fc4e903f7 100644
--- a/examples/protocols/http_server/advanced_tests/http_server_advanced_test.py
+++ b/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
diff --git a/tools/kconfig_new/test/test_confserver.py b/tools/kconfig_new/test/test_confserver.py
index ee9cf4349..738f16e01 100755
--- a/tools/kconfig_new/test/test_confserver.py
+++ b/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