From 9fc856b3a66756eb4d8443bf36c0a3754575cfae Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 21 Nov 2019 14:55:05 +0100 Subject: [PATCH] Minor update --- lib/core/settings.py | 2 +- lib/utils/deps.py | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 3b74ca465..133301557 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.3.11.90" +VERSION = "1.3.11.91" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) diff --git a/lib/utils/deps.py b/lib/utils/deps.py index 1dd2e525f..aec75c9cb 100644 --- a/lib/utils/deps.py +++ b/lib/utils/deps.py @@ -82,7 +82,7 @@ def checkDependencies(): try: __import__("websocket.ABNF") - debugMsg = "'python websocket-client' library is found" + debugMsg = "'websocket-client' library is found" logger.debug(debugMsg) except ImportError: warnMsg = "sqlmap requires 'websocket-client' third-party library " @@ -91,6 +91,26 @@ def checkDependencies(): logger.warn(warnMsg) missing_libraries.add('websocket-client') + try: + __import__("tkinter") + debugMsg = "'tkinter' library is found" + logger.debug(debugMsg) + except ImportError: + warnMsg = "sqlmap requires 'tkinter' library " + warnMsg += "if you plan to run a GUI" + logger.warn(warnMsg) + missing_libraries.add('tkinter') + + try: + __import__("tkinter.ttk") + debugMsg = "'tkinter.ttk' library is found" + logger.debug(debugMsg) + except ImportError: + warnMsg = "sqlmap requires 'tkinter.ttk' library " + warnMsg += "if you plan to run a GUI" + logger.warn(warnMsg) + missing_libraries.add('tkinter.ttk') + if IS_WIN: try: __import__("pyreadline")