From 90b444c9270f7e9c05a450e9eecf9d6b99722429 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 22 Jun 2022 11:58:09 +0200 Subject: [PATCH] Minor adjustments --- lib/core/settings.py | 2 +- lib/core/testing.py | 2 +- sqlmap.py | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index f05b8bc40..fb5df82e7 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from thirdparty import six from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.6.6.4" +VERSION = "1.6.6.5" 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/core/testing.py b/lib/core/testing.py index bf3a06732..0514b71e3 100644 --- a/lib/core/testing.py +++ b/lib/core/testing.py @@ -39,7 +39,7 @@ def vulnTest(): TESTS = ( ("-h", ("to see full list of options run with '-hh'",)), - ("--dependencies --deprecations", ("sqlmap requires", "third-party library", "~DeprecationWarning:")), + ("--dependencies", ("sqlmap requires", "third-party library")), ("-u --data=\"reflect=1\" --flush-session --wizard --disable-coloring", ("Please choose:", "back-end DBMS: SQLite", "current user is DBA: True", "banner: '3.")), ("-u --data=\"code=1\" --code=200 --technique=B --banner --no-cast --flush-session", ("back-end DBMS: SQLite", "banner: '3.", "~COALESCE(CAST(")), (u"-c --flush-session --output-dir=\"\" --smart --roles --statements --hostname --privileges --sql-query=\"SELECT '\u0161u\u0107uraj'\" --technique=U", (u": '\u0161u\u0107uraj'", "on SQLite it is not possible", "as the output directory")), diff --git a/sqlmap.py b/sqlmap.py index 2509251e9..1a372b034 100755 --- a/sqlmap.py +++ b/sqlmap.py @@ -32,15 +32,17 @@ try: import traceback import warnings + if "--deprecations" not in sys.argv: + warnings.filterwarnings(action="ignore", category=DeprecationWarning) + else: + warnings.resetwarnings() + warnings.filterwarnings(action="ignore", message="Python 2 is no longer supported") warnings.filterwarnings(action="ignore", message=".*was already imported", category=UserWarning) warnings.filterwarnings(action="ignore", message=".*using a very old release", category=UserWarning) warnings.filterwarnings(action="ignore", message=".*default buffer size will be used", category=RuntimeWarning) warnings.filterwarnings(action="ignore", category=UserWarning, module="psycopg2") - if "--deprecations" not in sys.argv: - warnings.filterwarnings(action="ignore", category=DeprecationWarning) - from lib.core.data import logger from lib.core.common import banner