diff --git a/feapder/db/mysqldb.py b/feapder/db/mysqldb.py index b0ee7ea4..5677a8fa 100644 --- a/feapder/db/mysqldb.py +++ b/feapder/db/mysqldb.py @@ -91,7 +91,15 @@ def __init__( @classmethod def from_url(cls, url, **kwargs): - # mysql://username:password@ip:port/db?charset=utf8mb4 + """ + + Args: + url: mysql://username:password@ip:port/db?charset=utf8mb4 + **kwargs: + + Returns: + + """ url_parsed = parse.urlparse(url) db_type = url_parsed.scheme.strip() @@ -137,8 +145,10 @@ def get_connection(self): return conn, cursor def close_connection(self, conn, cursor): - cursor.close() - conn.close() + if conn: + conn.close() + if cursor: + cursor.close() def size_of_connections(self): """ @@ -223,6 +233,7 @@ def add(self, sql, exception_callfunc=None): """ affect_count = None + conn, cursor = None, None try: conn, cursor = self.get_connection() @@ -268,6 +279,7 @@ def add_batch(self, sql, datas: List[Dict]): @result: 添加行数 """ affect_count = None + conn, cursor = None, None try: conn, cursor = self.get_connection() @@ -302,11 +314,12 @@ def add_batch_smart(self, table, datas: List[Dict], **kwargs): return self.add_batch(sql, datas) def update(self, sql): + conn, cursor = None, None + try: conn, cursor = self.get_connection() cursor.execute(sql) conn.commit() - except Exception as e: log.error( """ @@ -344,11 +357,11 @@ def delete(self, sql): Returns: True / False """ + conn, cursor = None, None try: conn, cursor = self.get_connection() cursor.execute(sql) conn.commit() - except Exception as e: log.error( """ @@ -364,11 +377,11 @@ def delete(self, sql): self.close_connection(conn, cursor) def execute(self, sql): + conn, cursor = None, None try: conn, cursor = self.get_connection() cursor.execute(sql) conn.commit() - except Exception as e: log.error( """ diff --git a/feapder/dedup/litefilter.py b/feapder/dedup/litefilter.py index 749818f8..da664190 100644 --- a/feapder/dedup/litefilter.py +++ b/feapder/dedup/litefilter.py @@ -18,7 +18,7 @@ def __init__(self): def add( self, keys: Union[List[str], str], *args, **kwargs - ) -> Union[list[int], int]: + ) -> Union[List[int], int]: """ Args: