Fixes Python 3.3 Travis broken build

stamparm · stamparm · commit 0eee52ae255d · 2019-05-16T12:41:26.000+02:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -3892,22 +3892,21 @@ def _thread(regex):
 
     return retVal
 
-def normalizeUnicode(value):
+def normalizeUnicode(value, charset=string.printable[:string.printable.find(' ') + 1]):
     """
     Does an ASCII normalization of unicode strings
 
     # Reference: http://www.peterbe.com/plog/unicode-to-ascii
 
     >>> normalizeUnicode(u'\u0161u\u0107uraj') == u'sucuraj'
     True
-    >>> normalizeUnicode(getUnicode(codecs.decode("666f6f00626172", "hex"))) == u'foobar'
+    >>> normalizeUnicode(getUnicode(decodeHex("666f6f00626172"))) == u'foobar'
     True
     """
 
     retVal = value
 
     if isinstance(value, six.text_type):
-        charset = string.printable[:string.printable.find(' ') + 1]
         retVal = unicodedata.normalize("NFKD", value)
         retVal = "".join(_ for _ in retVal if _ in charset)
 
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -18,7 +18,7 @@
 from thirdparty.six import unichr as _unichr
 
 # 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_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)
