Couple of minor patches

Author: stamparm

lib/core/settings.py

@@ -19,7 +19,7 @@
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.5.5.6"
+VERSION = "1.5.5.7"
 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)

thirdparty/ansistrm/ansistrm.py

@@ -4,8 +4,6 @@
 #
 
 import logging
-import os
-import re
 import sys
 
 from lib.core.settings import IS_WIN

thirdparty/beautifulsoup/beautifulsoup.py

@@ -85,7 +85,6 @@
 __license__ = "New-style BSD"
 
 import codecs
-import types
 import re
 import sys
 
@@ -2029,6 +2028,5 @@ def _ebcdic_to_ascii(self, s):
 
 #By default, act as an HTML pretty-printer.
 if __name__ == '__main__':
-    import sys
     soup = BeautifulSoup(sys.stdin)
     print(soup.prettify())

thirdparty/fcrypt/fcrypt.py

@@ -119,7 +119,7 @@
 # ----- END fcrypt.c LICENSE -----
 
 
-import string, struct, sys
+import struct, sys
 
 if sys.version_info >= (3, 0):
     xrange = range

thirdparty/keepalive/keepalive.py

@@ -517,7 +517,7 @@ def error_handler(url):
     keepalive_handler.close_all()
 
 def continuity(url):
-    import md5
+    from hashlib import md5
     format = '%25s: %s'
 
     # first fetch the file with the normal http handler
@@ -526,7 +526,7 @@ def continuity(url):
     fo = _urllib.request.urlopen(url)
     foo = fo.read()
     fo.close()
-    m = md5.new(foo)
+    m = md5(foo)
     print(format % ('normal urllib', m.hexdigest()))
 
     # now install the keepalive handler and try again
@@ -536,7 +536,7 @@ def continuity(url):
     fo = _urllib.request.urlopen(url)
     foo = fo.read()
     fo.close()
-    m = md5.new(foo)
+    m = md5(foo)
     print(format % ('keepalive read', m.hexdigest()))
 
     fo = _urllib.request.urlopen(url)
@@ -546,7 +546,7 @@ def continuity(url):
         if f: foo = foo + f
         else: break
     fo.close()
-    m = md5.new(foo)
+    m = md5(foo)
     print(format % ('keepalive readline', m.hexdigest()))
 
 def comp(N, url):

thirdparty/magic/magic.py

@@ -117,7 +117,6 @@ def from_buffer(buffer, mime=False):
             pass
 
     if not libmagic or not libmagic._name:
-        import sys
         platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
                                       '/usr/local/lib/libmagic.dylib',
                                       '/usr/local/Cellar/libmagic/5.10/lib/libmagic.dylib'],
@@ -223,4 +222,4 @@ def magic_load(cookie, filename):
 MAGIC_NO_CHECK_TROFF = 0x040000 # Don't check ascii/troff
 MAGIC_NO_CHECK_FORTRAN = 0x080000 # Don't check ascii/fortran
 MAGIC_NO_CHECK_TOKENS = 0x100000 # Don't check ascii/tokens
-MAGIC_UNKNOWN_FILETYPE = b"unknown"
+MAGIC_UNKNOWN_FILETYPE = b"unknown"

thirdparty/multipart/multipartpost.py

@@ -29,7 +29,6 @@
 
 from lib.core.compat import choose_boundary
 from lib.core.convert import getBytes
-from lib.core.convert import getText
 from lib.core.exception import SqlmapDataException
 from thirdparty.six.moves import urllib as _urllib
 

thirdparty/six/__init__.py

@@ -29,7 +29,7 @@
 import types
 
 __author__ = "Benjamin Peterson <[email protected]>"
-__version__ = "1.15.0"
+__version__ = "1.16.0"
 
 
 # Useful for very coarse version differentiation.
@@ -71,6 +71,11 @@ def __len__(self):
             MAXSIZE = int((1 << 63) - 1)
         del X
 
+if PY34:
+    from importlib.util import spec_from_loader
+else:
+    spec_from_loader = None
+
 
 def _add_doc(func, doc):
     """Add documentation to a function."""
@@ -186,6 +191,11 @@ def find_module(self, fullname, path=None):
             return self
         return None
 
+    def find_spec(self, fullname, path, target=None):
+        if fullname in self.known_modules:
+            return spec_from_loader(fullname, self)
+        return None
+
     def __get_module(self, fullname):
         try:
             return self.known_modules[fullname]