diff --git a/Jenkinsfile b/Jenkinsfile
index 33ce784bce134134bbb78ffffb9d58b71dbd17f7..b48dca02419a3e4f3f78ea1a16d93fd376e9d703 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ def pre_test(){
     make > /dev/null
     make install > /dev/null
     cd ${WKC}/tests
-    pip3 install ${WKC}/src/connector/python/linux/python3/
+    pip3 install ${WKC}/src/connector/python
     '''
     return 1
 }
diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md
index 15c722c180b8e4bd4daf8960f86f10b2f739f612..9edeb78c6884c79932c464cfaa2ac3d70123d787 100644
--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -400,27 +400,22 @@ Python连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/
 
 #### Linux
 
-用户可以在源代码的src/connector/python（或者tar.gz的/connector/python）文件夹下找到python2和python3的connector安装包。用户可以通过pip命令安装： 
+用户可以在源代码的src/connector/python（或者tar.gz的/connector/python）文件夹下找到connector安装包。用户可以通过pip命令安装： 
 
-​		`pip install src/connector/python/linux/python2/`
+​		`pip install src/connector/python/`
 
 或
 
-​		`pip3 install src/connector/python/linux/python3/`
+​		`pip3 install src/connector/python/`
 
 #### Windows
 在已安装Windows TDengine 客户端的情况下， 将文件"C:\TDengine\driver\taos.dll" 拷贝到 "C:\windows\system32" 目录下, 然后进入Windwos <em>cmd</em> 命令行界面
 ```cmd
-cd C:\TDengine\connector\python\windows
-python -m pip install python2\
-```
-或
-```cmd
-cd C:\TDengine\connector\python\windows
-python -m pip install python3\
+cd C:\TDengine\connector\python
+python -m pip install .
 ```
 
-* 如果机器上没有pip命令，用户可将src/connector/python/python3或src/connector/python/python2下的taos文件夹拷贝到应用程序的目录使用。
+* 如果机器上没有pip命令，用户可将src/connector/python下的taos文件夹拷贝到应用程序的目录使用。
 对于windows 客户端，安装TDengine windows 客户端后，将C:\TDengine\driver\taos.dll拷贝到C:\windows\system32目录下即可。
 
 ### 使用
diff --git a/packaging/tools/makeclient_power.sh b/packaging/tools/makeclient_power.sh
index 181536b7f19d252164201291d9c37cade6cf3490..23ee3003134e408d3da2e612611f3494e294876e 100755
--- a/packaging/tools/makeclient_power.sh
+++ b/packaging/tools/makeclient_power.sh
@@ -148,20 +148,11 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
   cp -r ${connector_dir}/python  ${install_dir}/connector/
   cp -r ${connector_dir}/go      ${install_dir}/connector 
   
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/cinterface.py
   
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/subscription.py
   
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/connection.py 
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/connection.py
 fi
 # Copy release note
 # cp ${script_dir}/release_note ${install_dir}
diff --git a/packaging/tools/makepkg_power.sh b/packaging/tools/makepkg_power.sh
index 554e7884b1c3db69acd3ba0e3234e468b1d31c79..359c5dba466a93ff30fca474004c633ba797af30 100755
--- a/packaging/tools/makepkg_power.sh
+++ b/packaging/tools/makepkg_power.sh
@@ -170,20 +170,11 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
   cp -r ${connector_dir}/python  ${install_dir}/connector/
   cp -r ${connector_dir}/go      ${install_dir}/connector
   
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/cinterface.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/cinterface.py
   
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/subscription.py
-  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/subscription.py
   
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/connection.py
-  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/connection.py
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/taos/connection.py
 fi
 # Copy release note
 # cp ${script_dir}/release_note ${install_dir}
diff --git a/src/connector/python/linux/python2 b/src/connector/python/linux/python2
deleted file mode 120000
index b870225aa053ea877524b581926b3536a0bd7314..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python2
+++ /dev/null
@@ -1 +0,0 @@
-../
\ No newline at end of file
diff --git a/src/connector/python/linux/python3/taos/__init__.py~origin_master b/src/connector/python/linux/python3/taos/__init__.py~origin_master
deleted file mode 100644
index 1b086f36ec5172beef8858358a436665806a8402..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python3/taos/__init__.py~origin_master
+++ /dev/null
@@ -1,25 +0,0 @@
-
-from .connection import TDengineConnection
-from .cursor import TDengineCursor
-from .error import Error
-
-# Globals
-threadsafety = 0
-paramstyle = 'pyformat'
-
-__all__ = ['connection', 'cursor']
-
-
-def connect(*args, **kwargs):
-    """ Function to return a TDengine connector object
-
-    Current supporting keyword parameters:
-    @dsn: Data source name as string
-    @user: Username as string(optional)
-    @password: Password as string(optional)
-    @host: Hostname(optional)
-    @database: Database name(optional)
-
-    @rtype: TDengineConnector
-    """
-    return TDengineConnection(*args, **kwargs)
diff --git a/src/connector/python/osx/python3 b/src/connector/python/osx/python3
deleted file mode 120000
index b870225aa053ea877524b581926b3536a0bd7314..0000000000000000000000000000000000000000
--- a/src/connector/python/osx/python3
+++ /dev/null
@@ -1 +0,0 @@
-../
\ No newline at end of file
diff --git a/src/connector/python/windows/python2 b/src/connector/python/windows/python2
deleted file mode 120000
index b870225aa053ea877524b581926b3536a0bd7314..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python2
+++ /dev/null
@@ -1 +0,0 @@
-../
\ No newline at end of file
diff --git a/src/connector/python/windows/python3 b/src/connector/python/windows/python3
deleted file mode 120000
index b870225aa053ea877524b581926b3536a0bd7314..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python3
+++ /dev/null
@@ -1 +0,0 @@
-../
\ No newline at end of file
diff --git a/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md b/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md
index b476c118a79a3845b88652ca229e08463077bfbe..6845d091b5f300bac0656078492467dc3db67830 100644
--- a/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md
+++ b/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md
@@ -8,8 +8,8 @@
 
 3.  mkdir debug; cd debug; cmake ..; make ; sudo make install
 
-4.  pip install ../src/connector/python/linux/python2 ; pip3 install
-    ../src/connector/python/linux/python3
+4.  pip install ../src/connector/python ; pip3 install
+    ../src/connector/python
 
 5.  pip install numpy; pip3 install numpy (numpy is required only if you need to run querySort.py)  
 
diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index 93db09ad6ce0e6888c64a4c334930b93e4f1f450..709b39d0772298ca6b18c147da857130aee1d78f 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -21,7 +21,7 @@ def pre_test(){
     cmake .. > /dev/null
     make > /dev/null
     make install > /dev/null
-    pip3 install ${WKC}/src/connector/python/linux/python3/
+    pip3 install ${WKC}/src/connector/python
     '''
     return 1
 }
diff --git a/tests/pytest/concurrent_inquiry.sh b/tests/pytest/concurrent_inquiry.sh
index e5918792f462c3a215e33d513dfb5a1fb9ded7f5..6ac15fb46fd727ca56b1aef7e7137ef822e5244a 100755
--- a/tests/pytest/concurrent_inquiry.sh
+++ b/tests/pytest/concurrent_inquiry.sh
@@ -48,7 +48,7 @@ fi
 PYTHON_EXEC=python3.8
 
 # First we need to set up a path for Python to find our own TAOS modules, so that "import" can work.
-export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3:$(pwd)
+export PYTHONPATH=$(pwd)/../../src/connector/python:$(pwd)
 
 # Then let us set up the library path so that our compiled SO file can be loaded by Python
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
diff --git a/tests/pytest/crash_gen.sh b/tests/pytest/crash_gen.sh
index 0af09634df5a5c418797ae4bd352c319fcbc74fa..127e13c5be1ea562cbe536bbb05f6ecd5844b0ea 100755
--- a/tests/pytest/crash_gen.sh
+++ b/tests/pytest/crash_gen.sh
@@ -48,7 +48,7 @@ fi
 PYTHON_EXEC=python3.8
 
 # First we need to set up a path for Python to find our own TAOS modules, so that "import" can work.
-export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3:$(pwd)
+export PYTHONPATH=$(pwd)/../../src/connector/python:$(pwd)
 
 # Then let us set up the library path so that our compiled SO file can be loaded by Python
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
diff --git a/tests/pytest/hivemq-extension-test.py b/tests/pytest/hivemq-extension-test.py
index 3d0b1ef83fe5841826ad0ab80384b5320662e104..9d293ea5edfc02ba4f22ee06c57735c62249f496 100644
--- a/tests/pytest/hivemq-extension-test.py
+++ b/tests/pytest/hivemq-extension-test.py
@@ -10,7 +10,7 @@
 #
 ###################################################################
 # install pip
-# pip install src/connector/python/linux/python2/
+# pip install src/connector/python/
 import sys
 import os
 import os.path
diff --git a/tests/pytest/perf_gen.sh b/tests/pytest/perf_gen.sh
index fcedd2d407b7e5a5d4b8e9373afd17376ae60c31..d28b5422f8ba4d4683c78020e45d2085385c4b4f 100755
--- a/tests/pytest/perf_gen.sh
+++ b/tests/pytest/perf_gen.sh
@@ -48,7 +48,7 @@ fi
 PYTHON_EXEC=python3.8
 
 # First we need to set up a path for Python to find our own TAOS modules, so that "import" can work.
-export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3:$(pwd)
+export PYTHONPATH=$(pwd)/../../src/connector/python:$(pwd)
 
 # Then let us set up the library path so that our compiled SO file can be loaded by Python
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
diff --git a/tests/pytest/simpletest_no_sudo.sh b/tests/pytest/simpletest_no_sudo.sh
index 61faf3df523f94562d1eeb2922ad4a4b3cc847e0..36edfc027fc12487a9e1d8fd66da623d219e8365 100755
--- a/tests/pytest/simpletest_no_sudo.sh
+++ b/tests/pytest/simpletest_no_sudo.sh
@@ -4,7 +4,7 @@
 #	2. No files are needed outside the development tree, everything is done in the local source code directory
 
 # First we need to set up a path for Python to find our own TAOS modules, so that "import" can work.
-export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3
+export PYTHONPATH=$(pwd)/../../src/connector/python
 
 # Then let us set up the library path so that our compiled SO file can be loaded by Python
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/../../build/build/lib
diff --git a/tests/pytest/test.py b/tests/pytest/test.py
index c7781f20873066b02416049e8c472e07c0c3e328..65abd3ef93555b6747f022595b20c5989aa851cb 100644
--- a/tests/pytest/test.py
+++ b/tests/pytest/test.py
@@ -10,7 +10,7 @@
 #
 ###################################################################
 # install pip
-# pip install src/connector/python/linux/python2/
+# pip install src/connector/python/
 
 # -*- coding: utf-8 -*-
 import sys
diff --git a/tests/pytest/test.sh b/tests/pytest/test.sh
index fbb9ba9879e0b22948fd448bba1bf5d0b7700497..4e74341f7075b50329a49aa3eccd09f68b733f20 100755
--- a/tests/pytest/test.sh
+++ b/tests/pytest/test.sh
@@ -13,7 +13,7 @@ else
 fi
 TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
 LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6|rev`/lib
-export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3
+export PYTHONPATH=$(pwd)/../../src/connector/python
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
 
 if [[ "$1" == *"test.py"* ]]; then
diff --git a/tests/pytest/testCompress.py b/tests/pytest/testCompress.py
index 0f5d9ef3b1b6898fa724eb9330f413e60fedd22b..1ad032f05f7ae0216ceb74747d25d49ed2146362 100644
--- a/tests/pytest/testCompress.py
+++ b/tests/pytest/testCompress.py
@@ -10,7 +10,7 @@
 #
 ###################################################################
 # install pip
-# pip install src/connector/python/linux/python2/
+# pip install src/connector/python/
 
 # -*- coding: utf-8 -*-
 import sys
diff --git a/tests/pytest/testMinTablesPerVnode.py b/tests/pytest/testMinTablesPerVnode.py
index 91cea833e7ad27e09defc9c43a6de820d05f8b33..a111113c07224377962d5acff66c058dde5e8439 100644
--- a/tests/pytest/testMinTablesPerVnode.py
+++ b/tests/pytest/testMinTablesPerVnode.py
@@ -10,7 +10,7 @@
 #
 ###################################################################
 # install pip
-# pip install src/connector/python/linux/python2/
+# pip install src/connector/python/
 
 # -*- coding: utf-8 -*-
 import sys
diff --git a/tests/pytest/testNoCompress.py b/tests/pytest/testNoCompress.py
index e3b40b4426f80080cfe48928851ec1e08c552dd7..d41055c755264fbc503df4709b8bd3eedaa11b07 100644
--- a/tests/pytest/testNoCompress.py
+++ b/tests/pytest/testNoCompress.py
@@ -10,7 +10,7 @@
 #
 ###################################################################
 # install pip
-# pip install src/connector/python/linux/python2/
+# pip install src/connector/python/
 
 # -*- coding: utf-8 -*-
 import sys