HA
/
patool
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed password support check from try...catch to check 'password' in inspect.signature(archive_cmdlist_func).parameters

This commit is contained in:
Vladimir Oprya 2020-11-14 12:31:09 +03:00
parent 3efaf35903
commit 237b025afc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patoolib/__init__.py
View File

@ -14,6 +14,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function from __future__ import print_function
import inspect
import sys import sys
if not hasattr(sys, "version_info") or sys.version_info < (2, 7, 0, "final", 0): if not hasattr(sys, "version_info") or sys.version_info < (2, 7, 0, "final", 0):
raise SystemExit("This program requires Python 2.7 or later.") raise SystemExit("This program requires Python 2.7 or later.")
@ -633,11 +635,9 @@ def get_archive_cmdlist_func (program, command, format):
if 'password' not in kwargs: if 'password' not in kwargs:
return archive_cmdlist_func(*args, **kwargs) return archive_cmdlist_func(*args, **kwargs)
else: else:
try: if 'password' in inspect.signature(archive_cmdlist_func).parameters:
return archive_cmdlist_func(*args, **kwargs) return archive_cmdlist_func(*args, **kwargs)
except TypeError as msg: raise util.PatoolError('There is no support for password in %s' % program)
if "unexpected keyword argument 'password'" in str(msg):
raise util.PatoolError('There is no support for password in %s' % program)
return check_for_password_before_cmdlist_func_call return check_for_password_before_cmdlist_func_call
except AttributeError as msg: except AttributeError as msg:
raise util.PatoolError(msg) raise util.PatoolError(msg)