wimby/tubesync
1
0 Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Keep the argument extraction in the function

Browse Source
This commit is contained in:
tcely authored and GitHub committed 2024-12-12 14:05:23 -05:00
1 parent 11789df864
commit 5ee295db01
1 file changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files
tubesync/tubesync/sqlite3/base.py
+3 -4
View File
@@ -26,10 +26,10 @@ class DatabaseWrapper(base.DatabaseWrapper):
cursor.execute(init_cmd.strip()) cursor.execute(init_cmd.strip())
def _remove_invalid_keyword_argument(self, arg_str, params): def _remove_invalid_keyword_argument(self, e_args, params):
try: try:
prog = re.compile(r"^(?P<quote>['])(?P<key>[^']+)(?P=quote) is an invalid keyword argument for Connection\(\)$") prog = re.compile(r"^(?P<quote>['])(?P<key>[^']+)(?P=quote) is an invalid keyword argument for Connection\(\)$")
match = prog.match(arg_str) match = prog.match(str(e_args[0]))
if match is None: if match is None:
return False return False
key = match.group('key') key = match.group('key')
@@ -61,8 +61,7 @@ class DatabaseWrapper(base.DatabaseWrapper):
try: try:
connection = super().get_new_connection(filtered_params) connection = super().get_new_connection(filtered_params)
except TypeError as e: except TypeError as e:
e_arg = str(e.args[0]) if not self._remove_invalid_keyword_argument(e.args, filtered_params):
if not self._remove_invalid_keyword_argument(e_arg, filtered_params):
# This isn't a TypeError we can handle # This isn't a TypeError we can handle
raise e raise e
return connection return connection