diff --git a/docs/conf_common.py b/docs/conf_common.py
index 708321af7..cbbb0a67f 100644
--- a/docs/conf_common.py
+++ b/docs/conf_common.py
@@ -267,11 +267,11 @@ pygments_style = 'sphinx'
 # Redirects should be listed in page_redirects.xt
 #
 with open("../page_redirects.txt") as f:
-    lines = [re.sub(" +", " ", l.strip()) for l in f.readlines() if l.strip() != "" and not l.startswith("#")]
+    lines = [re.sub(" +", " ", line.strip()) for line in f.readlines() if line.strip() != "" and not line.startswith("#")]
     for line in lines:  # check for well-formed entries
         if len(line.split(' ')) != 2:
             raise RuntimeError("Invalid line in page_redirects.txt: %s" % line)
-html_redirect_pages = [tuple(l.split(' ')) for l in lines]
+html_redirect_pages = [tuple(line.split(' ')) for line in lines]
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
diff --git a/docs/en/conf.py b/docs/en/conf.py
index 0713b97f1..f1b5844bb 100644
--- a/docs/en/conf.py
+++ b/docs/en/conf.py
@@ -6,15 +6,18 @@
 
 # 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
-from local_util import download_file_if_missing  # noqa: E402 - need to import from common folder
+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
+    from local_util import download_file_if_missing  # noqa: E402 - need to import from common folder
 
 # 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 0f7c85199..3595d1f03 100644
--- a/docs/zh_CN/conf.py
+++ b/docs/zh_CN/conf.py
@@ -6,15 +6,18 @@
 
 # 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
-from local_util import download_file_if_missing  # noqa: E402 - need to import from common folder
+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
+    from local_util import download_file_if_missing  # noqa: E402 - need to import from common folder
 
 # 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 c38bfbd53..a4c78ee2a 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
@@ -34,6 +34,8 @@ from idf_http_server_test import test as client
 # 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.
+
+
 @ttfw_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 e7da1f8c8..9f451a8c1 100755
--- a/tools/kconfig_new/test/test_confserver.py
+++ b/tools/kconfig_new/test/test_confserver.py
@@ -14,7 +14,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