Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4d5ff82

Browse filesBrowse files
authored
Merge pull request jxxghp#1 from Boris-code/master
sync
2 parents 44baab7 + e90435c commit 4d5ff82
Copy full SHA for 4d5ff82

3 files changed

+21-8Lines changed: 21 additions & 8 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎feapder/VERSION‎

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.8.5-beta1
1+
1.8.5
Collapse file

‎feapder/db/mysqldb.py‎

Copy file name to clipboardExpand all lines: feapder/db/mysqldb.py
+19-6Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,15 @@ def __init__(
9191

9292
@classmethod
9393
def from_url(cls, url, **kwargs):
94-
# mysql://username:password@ip:port/db?charset=utf8mb4
94+
"""
95+
96+
Args:
97+
url: mysql://username:password@ip:port/db?charset=utf8mb4
98+
**kwargs:
99+
100+
Returns:
101+
102+
"""
95103
url_parsed = parse.urlparse(url)
96104

97105
db_type = url_parsed.scheme.strip()
@@ -137,8 +145,10 @@ def get_connection(self):
137145
return conn, cursor
138146

139147
def close_connection(self, conn, cursor):
140-
cursor.close()
141-
conn.close()
148+
if conn:
149+
conn.close()
150+
if cursor:
151+
cursor.close()
142152

143153
def size_of_connections(self):
144154
"""
@@ -223,6 +233,7 @@ def add(self, sql, exception_callfunc=None):
223233
224234
"""
225235
affect_count = None
236+
conn, cursor = None, None
226237

227238
try:
228239
conn, cursor = self.get_connection()
@@ -268,6 +279,7 @@ def add_batch(self, sql, datas: List[Dict]):
268279
@result: 添加行数
269280
"""
270281
affect_count = None
282+
conn, cursor = None, None
271283

272284
try:
273285
conn, cursor = self.get_connection()
@@ -302,11 +314,12 @@ def add_batch_smart(self, table, datas: List[Dict], **kwargs):
302314
return self.add_batch(sql, datas)
303315

304316
def update(self, sql):
317+
conn, cursor = None, None
318+
305319
try:
306320
conn, cursor = self.get_connection()
307321
cursor.execute(sql)
308322
conn.commit()
309-
310323
except Exception as e:
311324
log.error(
312325
"""
@@ -344,11 +357,11 @@ def delete(self, sql):
344357
Returns: True / False
345358
346359
"""
360+
conn, cursor = None, None
347361
try:
348362
conn, cursor = self.get_connection()
349363
cursor.execute(sql)
350364
conn.commit()
351-
352365
except Exception as e:
353366
log.error(
354367
"""
@@ -364,11 +377,11 @@ def delete(self, sql):
364377
self.close_connection(conn, cursor)
365378

366379
def execute(self, sql):
380+
conn, cursor = None, None
367381
try:
368382
conn, cursor = self.get_connection()
369383
cursor.execute(sql)
370384
conn.commit()
371-
372385
except Exception as e:
373386
log.error(
374387
"""
Collapse file

‎feapder/dedup/litefilter.py‎

Copy file name to clipboardExpand all lines: feapder/dedup/litefilter.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def __init__(self):
1818

1919
def add(
2020
self, keys: Union[List[str], str], *args, **kwargs
21-
) -> Union[list[int], int]:
21+
) -> Union[List[int], int]:
2222
"""
2323
2424
Args:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.