diff --git a/lib/core/dump.py b/lib/core/dump.py index 9ca9fec7d..e79f96b2b 100644 --- a/lib/core/dump.py +++ b/lib/core/dump.py @@ -18,7 +18,6 @@ from lib.core.common import checkFile from lib.core.common import dataToDumpFile from lib.core.common import dataToStdout from lib.core.common import getSafeExString -from lib.core.common import getText from lib.core.common import isListLike from lib.core.common import isMultiThreadMode from lib.core.common import normalizeUnicode @@ -29,6 +28,7 @@ from lib.core.common import safeCSValue from lib.core.common import unsafeSQLIdentificatorNaming from lib.core.compat import xrange from lib.core.convert import getBytes +from lib.core.convert import getText from lib.core.convert import getUnicode from lib.core.data import conf from lib.core.data import kb diff --git a/lib/core/revision.py b/lib/core/revision.py index 6aa3eca6c..f0d682e39 100644 --- a/lib/core/revision.py +++ b/lib/core/revision.py @@ -9,8 +9,8 @@ import os import re import subprocess -from lib.core.common import getText from lib.core.common import openFile +from lib.core.convert import getText def getRevisionNumber(): """ diff --git a/lib/core/settings.py b/lib/core/settings.py index 5d109e339..b58058c1e 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.5.143" +VERSION = "1.3.5.144" 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/update.py b/lib/core/update.py index 3d628bbb9..8b48a6d9b 100644 --- a/lib/core/update.py +++ b/lib/core/update.py @@ -16,10 +16,10 @@ import zipfile from lib.core.common import dataToStdout from lib.core.common import getSafeExString from lib.core.common import getLatestRevision -from lib.core.common import getText from lib.core.common import openFile from lib.core.common import pollProcess from lib.core.common import readInput +from lib.core.convert import getText from lib.core.data import conf from lib.core.data import logger from lib.core.data import paths diff --git a/lib/request/basic.py b/lib/request/basic.py index e22db602f..b05fef8db 100644 --- a/lib/request/basic.py +++ b/lib/request/basic.py @@ -19,7 +19,6 @@ from lib.core.common import extractRegexResult from lib.core.common import filterNone from lib.core.common import getPublicTypeMembers from lib.core.common import getSafeExString -from lib.core.common import getText from lib.core.common import isListLike from lib.core.common import randomStr from lib.core.common import readInput @@ -29,6 +28,7 @@ from lib.core.common import singleTimeWarnMessage from lib.core.common import unArrayizeValue from lib.core.convert import decodeHex from lib.core.convert import getBytes +from lib.core.convert import getText from lib.core.convert import getUnicode from lib.core.data import conf from lib.core.data import kb