sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-11-01 00:17:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Python 3.3 Travis broken build

Browse Source
This commit is contained in:
Miroslav Stampar 2019-05-16 12:41:26 +02:00
parent e90846b8c1
commit 0eee52ae25
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/core/common.py
View File

@ -3892,7 +3892,7 @@ def removeReflectiveValues(content, payload, suppressWarning=False):
return retVal return retVal
def normalizeUnicode(value): def normalizeUnicode(value, charset=string.printable[:string.printable.find(' ') + 1]):
""" """
Does an ASCII normalization of unicode strings Does an ASCII normalization of unicode strings
@ -3900,14 +3900,13 @@ def normalizeUnicode(value):
>>> normalizeUnicode(u'\u0161u\u0107uraj') == u'sucuraj' >>> normalizeUnicode(u'\u0161u\u0107uraj') == u'sucuraj'
True True
>>> normalizeUnicode(getUnicode(codecs.decode("666f6f00626172", "hex"))) == u'foobar' >>> normalizeUnicode(getUnicode(decodeHex("666f6f00626172"))) == u'foobar'
True True
""" """
retVal = value retVal = value
if isinstance(value, six.text_type): if isinstance(value, six.text_type):
charset = string.printable[:string.printable.find(' ') + 1]
retVal = unicodedata.normalize("NFKD", value) retVal = unicodedata.normalize("NFKD", value)
retVal = "".join(_ for _ in retVal if _ in charset) retVal = "".join(_ for _ in retVal if _ in charset)

2
lib/core/settings.py
View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty.six import unichr as _unichr from thirdparty.six import unichr as _unichr
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.5.98" VERSION = "1.3.5.99"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} 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) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)