From d31c5f1dc86d0c3ac827165d83a3886bd170bcdd Mon Sep 17 00:00:00 2001
From: Linhe Huo <linhehuo@gmail.com>
Date: Mon, 30 Aug 2021 23:02:03 +0800
Subject: [PATCH 1/2] [TD-6449]<doc>: prefer english only in method
 documentations in python connector [ci skip] (#7711)

---
 src/connector/python/taos/cinterface.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py
index 42dac3c2e8..a1b6fe312b 100644
--- a/src/connector/python/taos/cinterface.py
+++ b/src/connector/python/taos/cinterface.py
@@ -102,9 +102,7 @@ _libtaos.taos_get_client_info.restype = c_char_p
 
 def taos_get_client_info():
     # type: () -> str
-    """Get client version info.
-    获取客户端版本信息。
-    """
+    """Get client version info."""
     return _libtaos.taos_get_client_info().decode()
 
 
@@ -114,6 +112,7 @@ _libtaos.taos_get_server_info.argtypes = (c_void_p,)
 
 def taos_get_server_info(connection):
     # type: (c_void_p) -> str
+    """Get server version as string."""
     return _libtaos.taos_get_server_info(connection).decode()
 
 
@@ -134,11 +133,10 @@ _libtaos.taos_connect.argtypes = c_char_p, c_char_p, c_char_p, c_char_p, c_uint1
 def taos_connect(host=None, user="root", password="taosdata", db=None, port=0):
     # type: (None|str, str, str, None|str, int) -> c_void_p
     """Create TDengine database connection.
-    创建数据库连接，初始化连接上下文。其中需要用户提供的参数包含：
 
-    - host: server hostname/FQDN, TDengine管理主节点的FQDN
-    - user: user name/用户名
-    - password: user password / 用户密码
+    - host: server hostname/FQDN
+    - user: user name
+    - password: user password
     - db: database name (optional)
     - port: server port
 
@@ -187,11 +185,10 @@ _libtaos.taos_connect_auth.argtypes = c_char_p, c_char_p, c_char_p, c_char_p, c_
 
 def taos_connect_auth(host=None, user="root", auth="", db=None, port=0):
     # type: (None|str, str, str, None|str, int) -> c_void_p
-    """
-    创建数据库连接，初始化连接上下文。其中需要用户提供的参数包含：
+    """Connect server with auth token.
 
-    - host: server hostname/FQDN, TDengine管理主节点的FQDN
-    - user: user name/用户名
+    - host: server hostname/FQDN
+    - user: user name
     - auth: base64 encoded auth token
     - db: database name (optional)
     - port: server port

From 2483985d4b81e888bff0a1aa7b2f4987e5e3c4f1 Mon Sep 17 00:00:00 2001
From: Linhe Huo <linhehuo@gmail.com>
Date: Mon, 30 Aug 2021 23:04:52 +0800
Subject: [PATCH 2/2] [TD-6449]<fix>: fix python3.6 datetime parsing in pytest
 util package (#7704)

---
 tests/pytest/util/sql.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py
index dfe1e4a582..2b654a3793 100644
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
@@ -21,7 +21,15 @@ import shutil
 import pandas as pd
 from util.log import *
 
-
+def _parse_datetime(timestr):
+    try:
+        return datetime.datetime.strptime(timestr, '%Y-%m-%d %H:%M:%S.%f')
+    except ValueError:
+        pass
+    try:
+        return datetime.datetime.strptime(timestr, '%Y-%m-%d %H:%M:%S')
+    except ValueError:
+        pass
 
 class TDSql:
     def __init__(self):
@@ -181,7 +189,7 @@ class TDSql:
                         tdLog.info("sql:%s, row:%d col:%d data:%d == expect:%s" %
                             (self.sql, row, col, self.queryResult[row][col], data))
                 else:
-                    if self.queryResult[row][col] == datetime.datetime.fromisoformat(data):
+                    if self.queryResult[row][col] == _parse_datetime(data):
                         tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" %
                             (self.sql, row, col, self.queryResult[row][col], data))
                 return