diff --git a/extra/icmpsh/icmpsh_m.py b/extra/icmpsh/icmpsh_m.py
index 00fbd8801..562223ab3 100644
--- a/extra/icmpsh/icmpsh_m.py
+++ b/extra/icmpsh/icmpsh_m.py
@@ -128,7 +128,7 @@ def main(src, dst):
                 try:
                     # Send it to the target host
                     sock.sendto(ip.get_packet(), (dst, 0))
-                except socket.error, ex:
+                except socket.error as ex:
                     sys.stderr.write("'%s'\n" % ex)
                     sys.stderr.flush()
 
diff --git a/extra/wafdetectify/wafdetectify.py b/extra/wafdetectify/wafdetectify.py
index bf5dc4bdb..c51b4f1cb 100755
--- a/extra/wafdetectify/wafdetectify.py
+++ b/extra/wafdetectify/wafdetectify.py
@@ -48,7 +48,7 @@ def get_page(get=None, url=None, host=None, data=None):
         conn = urllib2.urlopen(req, timeout=TIMEOUT)
         page = conn.read()
         headers = conn.info()
-    except Exception, ex:
+    except Exception as ex:
         code = getattr(ex, "code", None)
         page = ex.read() if hasattr(ex, "read") else getattr(ex, "msg", "")
         headers = ex.info() if hasattr(ex, "info") else {}
diff --git a/lib/controller/action.py b/lib/controller/action.py
index 933057a57..21658ec16 100644
--- a/lib/controller/action.py
+++ b/lib/controller/action.py
@@ -75,7 +75,7 @@ def action():
     if conf.getPasswordHashes:
         try:
             conf.dumper.userSettings("database management system users password hashes", conf.dbmsHandler.getPasswordHashes(), "password hash", CONTENT_TYPE.PASSWORDS)
-        except SqlmapNoneDataException, ex:
+        except SqlmapNoneDataException as ex:
             logger.critical(ex)
         except:
             raise
@@ -83,7 +83,7 @@ def action():
     if conf.getPrivileges:
         try:
             conf.dumper.userSettings("database management system users privileges", conf.dbmsHandler.getPrivileges(), "privilege", CONTENT_TYPE.PRIVILEGES)
-        except SqlmapNoneDataException, ex:
+        except SqlmapNoneDataException as ex:
             logger.critical(ex)
         except:
             raise
@@ -91,7 +91,7 @@ def action():
     if conf.getRoles:
         try:
             conf.dumper.userSettings("database management system users roles", conf.dbmsHandler.getRoles(), "role", CONTENT_TYPE.ROLES)
-        except SqlmapNoneDataException, ex:
+        except SqlmapNoneDataException as ex:
             logger.critical(ex)
         except:
             raise
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index aedb46e32..da836099a 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -1440,7 +1440,7 @@ def identifyWaf():
         try:
             logger.debug("checking for WAF/IPS product '%s'" % product)
             found = function(_)
-        except Exception, ex:
+        except Exception as ex:
             errMsg = "exception occurred while running "
             errMsg += "WAF script for '%s' ('%s')" % (product, getSafeExString(ex))
             logger.critical(errMsg)
@@ -1543,11 +1543,11 @@ def checkConnection(suppressOutput=False):
             except socket.gaierror:
                 errMsg = "host '%s' does not exist" % conf.hostname
                 raise SqlmapConnectionException(errMsg)
-            except socket.error, ex:
+            except socket.error as ex:
                 errMsg = "problem occurred while "
                 errMsg += "resolving a host name '%s' ('%s')" % (conf.hostname, getSafeExString(ex))
                 raise SqlmapConnectionException(errMsg)
-            except UnicodeError, ex:
+            except UnicodeError as ex:
                 errMsg = "problem occurred while "
                 errMsg += "handling a host name '%s' ('%s')" % (conf.hostname, getSafeExString(ex))
                 raise SqlmapDataException(errMsg)
@@ -1591,7 +1591,7 @@ def checkConnection(suppressOutput=False):
                 port = match.group(1) if match else 443
                 conf.url = re.sub(r":\d+(/|\Z)", ":%s\g<1>" % port, conf.url)
 
-    except SqlmapConnectionException, ex:
+    except SqlmapConnectionException as ex:
         if conf.ipv6:
             warnMsg = "check connection to a provided "
             warnMsg += "IPv6 address with a tool like ping6 "
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index 45924c626..6719130bd 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -257,7 +257,7 @@ def _saveToResultsFile():
             conf.resultsFP.write(line)
 
         conf.resultsFP.flush()
-    except IOError, ex:
+    except IOError as ex:
         errMsg = "unable to write to the results file '%s' ('%s'). " % (conf.resultsFilename, getSafeExString(ex))
         raise SqlmapSystemException(errMsg)
 
@@ -689,7 +689,7 @@ def start():
         except SqlmapSilentQuitException:
             raise
 
-        except SqlmapBaseException, ex:
+        except SqlmapBaseException as ex:
             errMsg = getSafeExString(ex)
 
             if conf.multipleTargets:
diff --git a/lib/controller/handler.py b/lib/controller/handler.py
index 9fb0cda6e..ce128dbb5 100644
--- a/lib/controller/handler.py
+++ b/lib/controller/handler.py
@@ -105,13 +105,13 @@ def setHandler():
 
                     if sqlalchemy.connector:
                         conf.dbmsConnector = sqlalchemy
-                except Exception, ex:
+                except Exception as ex:
                     exception = ex
 
             if not dialect or exception:
                 try:
                     conf.dbmsConnector.connect()
-                except Exception, ex:
+                except Exception as ex:
                     if exception:
                         raise exception
                     else:
diff --git a/lib/core/bigarray.py b/lib/core/bigarray.py
index 8d816a2dd..318c3aba1 100644
--- a/lib/core/bigarray.py
+++ b/lib/core/bigarray.py
@@ -87,7 +87,7 @@ class BigArray(list):
             try:
                 with open(self.chunks[-1], "rb") as f:
                     self.chunks[-1] = pickle.loads(bz2.decompress(f.read()))
-            except IOError, ex:
+            except IOError as ex:
                 errMsg = "exception occurred while retrieving data "
                 errMsg += "from a temporary file ('%s')" % ex.message
                 raise SqlmapSystemException(errMsg)
@@ -109,7 +109,7 @@ class BigArray(list):
             with open(filename, "w+b") as f:
                 f.write(bz2.compress(pickle.dumps(chunk, pickle.HIGHEST_PROTOCOL), BIGARRAY_COMPRESS_LEVEL))
             return filename
-        except (OSError, IOError), ex:
+        except (OSError, IOError) as ex:
             errMsg = "exception occurred while storing data "
             errMsg += "to a temporary file ('%s'). Please " % ex.message
             errMsg += "make sure that there is enough disk space left. If problem persists, "
@@ -126,7 +126,7 @@ class BigArray(list):
             try:
                 with open(self.chunks[index], "rb") as f:
                     self.cache = Cache(index, pickle.loads(bz2.decompress(f.read())), False)
-            except Exception, ex:
+            except Exception as ex:
                 errMsg = "exception occurred while retrieving data "
                 errMsg += "from a temporary file ('%s')" % ex.message
                 raise SqlmapSystemException(errMsg)
diff --git a/lib/core/common.py b/lib/core/common.py
index 4688cf4b4..c6c062952 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -943,7 +943,7 @@ def dataToTrafficFile(data):
     try:
         conf.trafficFP.write(data)
         conf.trafficFP.flush()
-    except IOError, ex:
+    except IOError as ex:
         errMsg = "something went wrong while trying "
         errMsg += "to write to the traffic file '%s' ('%s')" % (conf.trafficFile, getSafeExString(ex))
         raise SqlmapSystemException(errMsg)
@@ -952,7 +952,7 @@ def dataToDumpFile(dumpFile, data):
     try:
         dumpFile.write(data)
         dumpFile.flush()
-    except IOError, ex:
+    except IOError as ex:
         if "No space left" in getUnicode(ex):
             errMsg = "no space left on output device"
             logger.error(errMsg)
@@ -972,7 +972,7 @@ def dataToOutFile(filename, data):
             try:
                 with open(retVal, "w+b") as f:  # has to stay as non-codecs because data is raw ASCII encoded data
                     f.write(unicodeencode(data))
-            except UnicodeEncodeError, ex:
+            except UnicodeEncodeError as ex:
                 _ = normalizeUnicode(filename)
                 if filename != _:
                     filename = _
@@ -980,7 +980,7 @@ def dataToOutFile(filename, data):
                     errMsg = "couldn't write to the "
                     errMsg += "output file ('%s')" % getSafeExString(ex)
                     raise SqlmapGenericException(errMsg)
-            except IOError, ex:
+            except IOError as ex:
                 errMsg = "something went wrong while trying to write "
                 errMsg += "to the output file ('%s')" % getSafeExString(ex)
                 raise SqlmapGenericException(errMsg)
@@ -1446,7 +1446,7 @@ def parseTargetUrl():
 
     try:
         urlSplit = urlparse.urlsplit(conf.url)
-    except ValueError, ex:
+    except ValueError as ex:
         errMsg = "invalid URL '%s' has been given ('%s'). " % (conf.url, getSafeExString(ex))
         errMsg += "Please be sure that you don't have any leftover characters (e.g. '[' or ']') "
         errMsg += "in the hostname part"
@@ -2038,7 +2038,7 @@ def parseXmlFile(xmlFile, handler):
     try:
         with contextlib.closing(StringIO(readCachedFileContent(xmlFile))) as stream:
             parse(stream, handler)
-    except (SAXParseException, UnicodeError), ex:
+    except (SAXParseException, UnicodeError) as ex:
         errMsg = "something appears to be wrong with "
         errMsg += "the file '%s' ('%s'). Please make " % (xmlFile, getSafeExString(ex))
         errMsg += "sure that you haven't made any changes to it"
@@ -2104,7 +2104,7 @@ def readCachedFileContent(filename, mode="rb"):
                 try:
                     with openFile(filename, mode) as f:
                         kb.cache.content[filename] = f.read()
-                except (IOError, OSError, MemoryError), ex:
+                except (IOError, OSError, MemoryError) as ex:
                     errMsg = "something went wrong while trying "
                     errMsg += "to read the content of file '%s' ('%s')" % (filename, getSafeExString(ex))
                     raise SqlmapSystemException(errMsg)
@@ -2218,7 +2218,7 @@ def getFileItems(filename, commentPrefix='#', unicoded=True, lowercase=False, un
                         retVal[line] = True
                     else:
                         retVal.append(line)
-    except (IOError, OSError, MemoryError), ex:
+    except (IOError, OSError, MemoryError) as ex:
         errMsg = "something went wrong while trying "
         errMsg += "to read the content of file '%s' ('%s')" % (filename, getSafeExString(ex))
         raise SqlmapSystemException(errMsg)
@@ -2351,7 +2351,7 @@ def getUnicode(value, encoding=None, noneToNull=False):
         while True:
             try:
                 return unicode(value, encoding or (kb.get("pageEncoding") if kb.get("originalPage") else None) or UNICODE_ENCODING)
-            except UnicodeDecodeError, ex:
+            except UnicodeDecodeError as ex:
                 try:
                     return unicode(value, UNICODE_ENCODING)
                 except:
@@ -2407,7 +2407,7 @@ def pushValue(value):
             getCurrentThreadData().valueStack.append(copy.deepcopy(value))
             success = True
             break
-        except Exception, ex:
+        except Exception as ex:
             _ = ex
 
     if not success:
@@ -3095,7 +3095,7 @@ def saveConfig(conf, filename):
     with openFile(filename, "wb") as f:
         try:
             config.write(f)
-        except IOError, ex:
+        except IOError as ex:
             errMsg = "something went wrong while trying "
             errMsg += "to write to the configuration file '%s' ('%s')" % (filename, getSafeExString(ex))
             raise SqlmapSystemException(errMsg)
@@ -3442,7 +3442,7 @@ def createGithubIssue(errMsg, excMsg):
 
         try:
             content = urllib2.urlopen(req).read()
-        except Exception, ex:
+        except Exception as ex:
             content = None
 
         issueUrl = re.search(r"https://github.com/sqlmapproject/sqlmap/issues/\d+", content or "")
@@ -4063,7 +4063,7 @@ def findPageForms(content, url, raise_=False, addToTargets=False):
                     continue
 
                 request = form.click()
-            except (ValueError, TypeError), ex:
+            except (ValueError, TypeError) as ex:
                 errMsg = "there has been a problem while "
                 errMsg += "processing page forms ('%s')" % getSafeExString(ex)
                 if raise_:
@@ -4193,7 +4193,7 @@ def evaluateCode(code, variables=None):
         exec(code, variables)
     except KeyboardInterrupt:
         raise
-    except Exception, ex:
+    except Exception as ex:
         errMsg = "an error occurred while evaluating provided code ('%s') " % getSafeExString(ex)
         raise SqlmapGenericException(errMsg)
 
@@ -4715,7 +4715,7 @@ def parseRequestFile(reqFile, checkParams=True):
     try:
         with openFile(reqFile, "rb") as f:
             content = f.read()
-    except (IOError, OSError, MemoryError), ex:
+    except (IOError, OSError, MemoryError) as ex:
         errMsg = "something went wrong while trying "
         errMsg += "to read the content of file '%s' ('%s')" % (reqFile, getSafeExString(ex))
         raise SqlmapSystemException(errMsg)
diff --git a/lib/core/dump.py b/lib/core/dump.py
index 6aff93457..ed468b33e 100644
--- a/lib/core/dump.py
+++ b/lib/core/dump.py
@@ -79,7 +79,7 @@ class Dump(object):
 
         try:
             self._outputFP.write(text)
-        except IOError, ex:
+        except IOError as ex:
             errMsg = "error occurred while writing to log file ('%s')" % getSafeExString(ex)
             raise SqlmapGenericException(errMsg)
 
@@ -99,7 +99,7 @@ class Dump(object):
         self._outputFile = os.path.join(conf.outputPath, "log")
         try:
             self._outputFP = openFile(self._outputFile, "ab" if not conf.flushSession else "wb")
-        except IOError, ex:
+        except IOError as ex:
             errMsg = "error occurred while opening log file ('%s')" % getSafeExString(ex)
             raise SqlmapGenericException(errMsg)
 
@@ -426,7 +426,7 @@ class Dump(object):
                     if not os.path.isdir(dumpDbPath):
                         try:
                             os.makedirs(dumpDbPath)
-                        except Exception, ex:
+                        except Exception as ex:
                             try:
                                 tempDir = tempfile.mkdtemp(prefix="sqlmapdb")
                             except IOError, _:
diff --git a/lib/core/option.py b/lib/core/option.py
index 8324de5ab..9d71014f5 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -194,7 +194,7 @@ def _loadQueries():
     tree = ElementTree()
     try:
         tree.parse(paths.QUERIES_XML)
-    except Exception, ex:
+    except Exception as ex:
         errMsg = "something appears to be wrong with "
         errMsg += "the file '%s' ('%s'). Please make " % (paths.QUERIES_XML, getSafeExString(ex))
         errMsg += "sure that you haven't made any changes to it"
@@ -335,7 +335,7 @@ def _setCrawler():
                 if conf.verbose in (1, 2):
                     status = "%d/%d links visited (%d%%)" % (i + 1, len(targets), round(100.0 * (i + 1) / len(targets)))
                     dataToStdout("\r[%s] [INFO] %s" % (time.strftime("%X"), status), True)
-            except Exception, ex:
+            except Exception as ex:
                 errMsg = "problem occurred while crawling at '%s' ('%s')" % (target, getSafeExString(ex))
                 logger.error(errMsg)
 
@@ -471,7 +471,7 @@ def _findPageForms():
                     dataToStdout("\r[%s] [INFO] %s" % (time.strftime("%X"), status), True)
             except KeyboardInterrupt:
                 break
-            except Exception, ex:
+            except Exception as ex:
                 errMsg = "problem occurred while searching for forms at '%s' ('%s')" % (target, getSafeExString(ex))
                 logger.error(errMsg)
 
@@ -768,7 +768,7 @@ def _setTamperingFunctions():
 
             try:
                 module = __import__(filename[:-3].encode(sys.getfilesystemencoding() or UNICODE_ENCODING))
-            except Exception, ex:
+            except Exception as ex:
                 raise SqlmapSyntaxException("cannot import tamper module '%s' (%s)" % (filename[:-3], getSafeExString(ex)))
 
             priority = PRIORITY.NORMAL if not hasattr(module, "__priority__") else module.__priority__
@@ -801,7 +801,7 @@ def _setTamperingFunctions():
                 elif name == "dependencies":
                     try:
                         function()
-                    except Exception, ex:
+                    except Exception as ex:
                         errMsg = "error occurred while checking dependencies "
                         errMsg += "for tamper module '%s' ('%s')" % (filename[:-3], getSafeExString(ex))
                         raise SqlmapGenericException(errMsg)
@@ -974,7 +974,7 @@ def _setHTTPHandlers():
 
         try:
             _ = urlparse.urlsplit(conf.proxy)
-        except Exception, ex:
+        except Exception as ex:
             errMsg = "invalid proxy address '%s' ('%s')" % (conf.proxy, getSafeExString(ex))
             raise SqlmapSyntaxException(errMsg)
 
@@ -1376,7 +1376,7 @@ def _setHostname():
     if conf.url:
         try:
             conf.hostname = urlparse.urlsplit(conf.url).netloc.split(':')[0]
-        except ValueError, ex:
+        except ValueError as ex:
             errMsg = "problem occurred while "
             errMsg += "parsing an URL '%s' ('%s')" % (conf.url, getSafeExString(ex))
             raise SqlmapDataException(errMsg)
@@ -1430,7 +1430,7 @@ def _createTemporaryDirectory():
 
             warnMsg = "using '%s' as the temporary directory" % conf.tmpDir
             logger.warn(warnMsg)
-        except (OSError, IOError), ex:
+        except (OSError, IOError) as ex:
             errMsg = "there has been a problem while accessing "
             errMsg += "temporary directory location(s) ('%s')" % getSafeExString(ex)
             raise SqlmapSystemException(errMsg)
@@ -1438,7 +1438,7 @@ def _createTemporaryDirectory():
         try:
             if not os.path.isdir(tempfile.gettempdir()):
                 os.makedirs(tempfile.gettempdir())
-        except Exception, ex:
+        except Exception as ex:
             warnMsg = "there has been a problem while accessing "
             warnMsg += "system's temporary directory location(s) ('%s'). Please " % getSafeExString(ex)
             warnMsg += "make sure that there is enough disk space left. If problem persists, "
@@ -1457,7 +1457,7 @@ def _createTemporaryDirectory():
     if not os.path.isdir(tempfile.tempdir):
         try:
             os.makedirs(tempfile.tempdir)
-        except Exception, ex:
+        except Exception as ex:
             errMsg = "there has been a problem while setting "
             errMsg += "temporary directory location ('%s')" % getSafeExString(ex)
             raise SqlmapSystemException(errMsg)
@@ -2329,14 +2329,14 @@ def _basicOptionValidation():
     if conf.regexp:
         try:
             re.compile(conf.regexp)
-        except Exception, ex:
+        except Exception as ex:
             errMsg = "invalid regular expression '%s' ('%s')" % (conf.regexp, getSafeExString(ex))
             raise SqlmapSyntaxException(errMsg)
 
     if conf.crawlExclude:
         try:
             re.compile(conf.crawlExclude)
-        except Exception, ex:
+        except Exception as ex:
             errMsg = "invalid regular expression '%s' ('%s')" % (conf.crawlExclude, getSafeExString(ex))
             raise SqlmapSyntaxException(errMsg)
 
diff --git a/lib/core/replication.py b/lib/core/replication.py
index f9444af75..01f2495a6 100644
--- a/lib/core/replication.py
+++ b/lib/core/replication.py
@@ -27,7 +27,7 @@ class Replication(object):
             self.connection = sqlite3.connect(dbpath)
             self.connection.isolation_level = None
             self.cursor = self.connection.cursor()
-        except sqlite3.OperationalError, ex:
+        except sqlite3.OperationalError as ex:
             errMsg = "error occurred while opening a replication "
             errMsg += "file '%s' ('%s')" % (self.filepath, getSafeExString(ex))
             raise SqlmapConnectionException(errMsg)
@@ -63,7 +63,7 @@ class Replication(object):
                         self.execute('CREATE TABLE "%s" (%s)' % (self.name, ','.join('"%s" %s' % (unsafeSQLIdentificatorNaming(colname), coltype) for colname, coltype in self.columns)))
                     else:
                         self.execute('CREATE TABLE "%s" (%s)' % (self.name, ','.join('"%s"' % unsafeSQLIdentificatorNaming(colname) for colname in self.columns)))
-                except Exception, ex:
+                except Exception as ex:
                     errMsg = "problem occurred ('%s') while initializing the sqlite database " % getSafeExString(ex, UNICODE_ENCODING)
                     errMsg += "located at '%s'" % self.parent.dbpath
                     raise SqlmapGenericException(errMsg)
@@ -82,7 +82,7 @@ class Replication(object):
         def execute(self, sql, parameters=[]):
             try:
                 self.parent.cursor.execute(sql, parameters)
-            except sqlite3.OperationalError, ex:
+            except sqlite3.OperationalError as ex:
                 errMsg = "problem occurred ('%s') while accessing sqlite database " % getSafeExString(ex, UNICODE_ENCODING)
                 errMsg += "located at '%s'. Please make sure that " % self.parent.dbpath
                 errMsg += "it's not used by some other program"
diff --git a/lib/core/settings.py b/lib/core/settings.py
index eaa457465..69dc0e27f 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.1.59"
+VERSION = "1.3.1.60"
 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/target.py b/lib/core/target.py
index af20a0027..5a6c47f47 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -558,7 +558,7 @@ def _setResultsFile():
         conf.resultsFilename = os.path.join(paths.SQLMAP_OUTPUT_PATH, time.strftime(RESULTS_FILE_FORMAT).lower())
         try:
             conf.resultsFP = openFile(conf.resultsFilename, "a", UNICODE_ENCODING, buffering=0)
-        except (OSError, IOError), ex:
+        except (OSError, IOError) as ex:
             try:
                 warnMsg = "unable to create results file '%s' ('%s'). " % (conf.resultsFilename, getUnicode(ex))
                 handle, conf.resultsFilename = tempfile.mkstemp(prefix=MKSTEMP_PREFIX.RESULTS, suffix=".csv")
@@ -590,7 +590,7 @@ def _createFilesDir():
     if not os.path.isdir(conf.filePath):
         try:
             os.makedirs(conf.filePath)
-        except OSError, ex:
+        except OSError as ex:
             tempDir = tempfile.mkdtemp(prefix="sqlmapfiles")
             warnMsg = "unable to create files directory "
             warnMsg += "'%s' (%s). " % (conf.filePath, getUnicode(ex))
@@ -612,7 +612,7 @@ def _createDumpDir():
     if not os.path.isdir(conf.dumpPath):
         try:
             os.makedirs(conf.dumpPath)
-        except OSError, ex:
+        except OSError as ex:
             tempDir = tempfile.mkdtemp(prefix="sqlmapdump")
             warnMsg = "unable to create dump directory "
             warnMsg += "'%s' (%s). " % (conf.dumpPath, getUnicode(ex))
@@ -643,7 +643,7 @@ def _createTargetDirs():
             if conf.outputDir and context == "output":
                 warnMsg = "using '%s' as the %s directory" % (directory, context)
                 logger.warn(warnMsg)
-        except (OSError, IOError), ex:
+        except (OSError, IOError) as ex:
             try:
                 tempDir = tempfile.mkdtemp(prefix="sqlmap%s" % context)
             except Exception, _:
@@ -665,7 +665,7 @@ def _createTargetDirs():
     try:
         if not os.path.isdir(conf.outputPath):
             os.makedirs(conf.outputPath)
-    except (OSError, IOError, TypeError), ex:
+    except (OSError, IOError, TypeError) as ex:
         try:
             tempDir = tempfile.mkdtemp(prefix="sqlmapoutput")
         except Exception, _:
@@ -691,7 +691,7 @@ def _createTargetDirs():
             f.write("  # %s" % getUnicode(subprocess.list2cmdline(sys.argv), encoding=sys.stdin.encoding))
             if conf.data:
                 f.write("\n\n%s" % getUnicode(conf.data))
-    except IOError, ex:
+    except IOError as ex:
         if "denied" in getUnicode(ex):
             errMsg = "you don't have enough permissions "
         else:
diff --git a/lib/core/threads.py b/lib/core/threads.py
index 9c0de76e2..d27cc259c 100644
--- a/lib/core/threads.py
+++ b/lib/core/threads.py
@@ -91,7 +91,7 @@ def exceptionHandledFunction(threadFunction, silent=False):
         kb.threadContinue = False
         kb.threadException = True
         raise
-    except Exception, ex:
+    except Exception as ex:
         if not silent and kb.get("threadContinue"):
             logger.error("thread %s: %s" % (threading.currentThread().getName(), ex.message))
 
@@ -150,7 +150,7 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio
 
             try:
                 thread.start()
-            except Exception, ex:
+            except Exception as ex:
                 errMsg = "error occurred while starting new thread ('%s')" % ex.message
                 logger.critical(errMsg)
                 break
@@ -166,7 +166,7 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio
                     alive = True
                     time.sleep(0.1)
 
-    except (KeyboardInterrupt, SqlmapUserQuitException), ex:
+    except (KeyboardInterrupt, SqlmapUserQuitException) as ex:
         print
         kb.prependFlag = False
         kb.threadContinue = False
@@ -184,7 +184,7 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio
         if forwardException:
             raise
 
-    except (SqlmapConnectionException, SqlmapValueException), ex:
+    except (SqlmapConnectionException, SqlmapValueException) as ex:
         print
         kb.threadException = True
         logger.error("thread %s: %s" % (threading.currentThread().getName(), ex.message))
diff --git a/lib/core/update.py b/lib/core/update.py
index 814424a37..6a3f984c7 100644
--- a/lib/core/update.py
+++ b/lib/core/update.py
@@ -51,7 +51,7 @@ def update():
 
             try:
                 open(os.path.join(directory, "sqlmap.py"), "w+b")
-            except Exception, ex:
+            except Exception as ex:
                 errMsg = "unable to update content of directory '%s' ('%s')" % (directory, getSafeExString(ex))
                 logger.error(errMsg)
             else:
@@ -85,7 +85,7 @@ def update():
                                 version = re.search(r"(?m)^VERSION\s*=\s*['\"]([^'\"]+)", f.read()).group(1)
                                 logger.info("updated to the latest version '%s#dev'" % version)
                                 success = True
-                    except Exception, ex:
+                    except Exception as ex:
                         logger.error("update could not be completed ('%s')" % getSafeExString(ex))
                     else:
                         if not success:
@@ -110,7 +110,7 @@ def update():
             pollProcess(process, True)
             stdout, stderr = process.communicate()
             success = not process.returncode
-        except (IOError, OSError), ex:
+        except (IOError, OSError) as ex:
             success = False
             stderr = getSafeExString(ex)
 
diff --git a/lib/core/wordlist.py b/lib/core/wordlist.py
index 70d93f333..92cbef28c 100644
--- a/lib/core/wordlist.py
+++ b/lib/core/wordlist.py
@@ -43,7 +43,7 @@ class Wordlist(object):
             if os.path.splitext(self.current)[1].lower() == ".zip":
                 try:
                     _ = zipfile.ZipFile(self.current, 'r')
-                except zipfile.error, ex:
+                except zipfile.error as ex:
                     errMsg = "something appears to be wrong with "
                     errMsg += "the file '%s' ('%s'). Please make " % (self.current, getSafeExString(ex))
                     errMsg += "sure that you haven't made any changes to it"
@@ -69,7 +69,7 @@ class Wordlist(object):
             self.counter += 1
             try:
                 retVal = self.iter.next().rstrip()
-            except zipfile.error, ex:
+            except zipfile.error as ex:
                 errMsg = "something appears to be wrong with "
                 errMsg += "the file '%s' ('%s'). Please make " % (self.current, getSafeExString(ex))
                 errMsg += "sure that you haven't made any changes to it"
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index db8697206..669985bc2 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -814,7 +814,7 @@ def cmdLineParser(argv=None):
             try:
                 for arg in shlex.split(command):
                     argv.append(getUnicode(arg, encoding=sys.stdin.encoding))
-            except ValueError, ex:
+            except ValueError as ex:
                 raise SqlmapSyntaxException("something went wrong during command line parsing ('%s')" % ex.message)
 
         for i in xrange(len(argv)):
@@ -866,7 +866,7 @@ def cmdLineParser(argv=None):
 
         try:
             (args, _) = parser.parse_args(argv)
-        except UnicodeEncodeError, ex:
+        except UnicodeEncodeError as ex:
             dataToStdout("\n[!] %s\n" % ex.object.encode("unicode-escape"))
             raise SystemExit
         except SystemExit:
diff --git a/lib/parse/configfile.py b/lib/parse/configfile.py
index c76b73994..4095c1dcc 100644
--- a/lib/parse/configfile.py
+++ b/lib/parse/configfile.py
@@ -39,7 +39,7 @@ def configFileProxy(section, option, datatype):
                 value = config.getfloat(section, option) if config.get(section, option) else 0.0
             else:
                 value = config.get(section, option)
-        except ValueError, ex:
+        except ValueError as ex:
             errMsg = "error occurred while processing the option "
             errMsg += "'%s' in provided configuration file ('%s')" % (option, getUnicode(ex))
             raise SqlmapSyntaxException(errMsg)
@@ -71,7 +71,7 @@ def configFileParser(configFile):
     try:
         config = UnicodeRawConfigParser()
         config.readfp(configFP)
-    except Exception, ex:
+    except Exception as ex:
         errMsg = "you have provided an invalid and/or unreadable configuration file ('%s')" % getSafeExString(ex)
         raise SqlmapSyntaxException(errMsg)
 
diff --git a/lib/parse/payloads.py b/lib/parse/payloads.py
index 1eb13d498..3d5009878 100644
--- a/lib/parse/payloads.py
+++ b/lib/parse/payloads.py
@@ -78,7 +78,7 @@ def parseXmlNode(node):
 def loadBoundaries():
     try:
         doc = et.parse(paths.BOUNDARIES_XML)
-    except Exception, ex:
+    except Exception as ex:
         errMsg = "something appears to be wrong with "
         errMsg += "the file '%s' ('%s'). Please make " % (paths.BOUNDARIES_XML, getSafeExString(ex))
         errMsg += "sure that you haven't made any changes to it"
@@ -93,7 +93,7 @@ def loadPayloads():
 
         try:
             doc = et.parse(payloadFilePath)
-        except Exception, ex:
+        except Exception as ex:
             errMsg = "something appears to be wrong with "
             errMsg += "the file '%s' ('%s'). Please make " % (payloadFilePath, getSafeExString(ex))
             errMsg += "sure that you haven't made any changes to it"
diff --git a/lib/request/connect.py b/lib/request/connect.py
index e336941fa..c8538b4c4 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -556,11 +556,11 @@ class Connect(object):
                     if hasattr(conn.fp, '_sock'):
                         conn.fp._sock.close()
                     conn.close()
-                except Exception, ex:
+                except Exception as ex:
                     warnMsg = "problem occurred during connection closing ('%s')" % getSafeExString(ex)
                     logger.warn(warnMsg)
 
-        except SqlmapConnectionException, ex:
+        except SqlmapConnectionException as ex:
             if conf.proxyList and not kb.threadException:
                 warnMsg = "unable to connect to the target URL ('%s')" % ex
                 logger.critical(warnMsg)
@@ -569,7 +569,7 @@ class Connect(object):
             else:
                 raise
 
-        except urllib2.HTTPError, ex:
+        except urllib2.HTTPError as ex:
             page = None
             responseHeaders = None
 
@@ -834,7 +834,7 @@ class Connect(object):
 
                     try:
                         payload = function(payload=payload, headers=auxHeaders, delimiter=delimiter, hints=hints)
-                    except Exception, ex:
+                    except Exception as ex:
                         errMsg = "error occurred while running tamper "
                         errMsg += "function '%s' ('%s')" % (function.func_name, getSafeExString(ex))
                         raise SqlmapGenericException(errMsg)
@@ -1097,7 +1097,7 @@ class Connect(object):
             while True:
                 try:
                     compiler.parse(unicodeencode(conf.evalCode.replace(';', '\n')))
-                except SyntaxError, ex:
+                except SyntaxError as ex:
                     if ex.text:
                         original = replacement = ex.text.strip()
                         if '=' in original:
diff --git a/lib/request/dns.py b/lib/request/dns.py
index 9eeb7630e..0b9c525ec 100644
--- a/lib/request/dns.py
+++ b/lib/request/dns.py
@@ -149,7 +149,7 @@ if __name__ == "__main__":
 
             time.sleep(1)
 
-    except socket.error, ex:
+    except socket.error as ex:
         if 'Permission' in str(ex):
             print "[x] Please run with sudo/Administrator privileges"
         else:
diff --git a/lib/request/httpshandler.py b/lib/request/httpshandler.py
index 33a9dfc8b..c75d2f6e9 100644
--- a/lib/request/httpshandler.py
+++ b/lib/request/httpshandler.py
@@ -63,7 +63,7 @@ class HTTPSConnection(httplib.HTTPSConnection):
                         break
                     else:
                         sock.close()
-                except (ssl.SSLError, socket.error, httplib.BadStatusLine), ex:
+                except (ssl.SSLError, socket.error, httplib.BadStatusLine) as ex:
                     self._tunnel_host = None
                     logger.debug("SSL connection error occurred ('%s')" % getSafeExString(ex))
 
@@ -83,7 +83,7 @@ class HTTPSConnection(httplib.HTTPSConnection):
                         break
                     else:
                         sock.close()
-                except (ssl.SSLError, socket.error, httplib.BadStatusLine), ex:
+                except (ssl.SSLError, socket.error, httplib.BadStatusLine) as ex:
                     self._tunnel_host = None
                     logger.debug("SSL connection error occurred ('%s')" % getSafeExString(ex))
 
diff --git a/lib/request/pkihandler.py b/lib/request/pkihandler.py
index f34aedf2b..8e66409c8 100644
--- a/lib/request/pkihandler.py
+++ b/lib/request/pkihandler.py
@@ -24,7 +24,7 @@ class HTTPSPKIAuthHandler(urllib2.HTTPSHandler):
         try:
             # Reference: https://docs.python.org/2/library/ssl.html#ssl.SSLContext.load_cert_chain
             return httplib.HTTPSConnection(host, cert_file=self.auth_file, key_file=self.auth_file, timeout=conf.timeout)
-        except IOError, ex:
+        except IOError as ex:
             errMsg = "error occurred while using key "
             errMsg += "file '%s' ('%s')" % (self.auth_file, getSafeExString(ex))
             raise SqlmapConnectionException(errMsg)
diff --git a/lib/utils/api.py b/lib/utils/api.py
index 2faa81a6d..ec1dceeaa 100644
--- a/lib/utils/api.py
+++ b/lib/utils/api.py
@@ -95,7 +95,7 @@ class Database(object):
                     self.cursor.execute(statement, arguments)
                 else:
                     self.cursor.execute(statement)
-            except sqlite3.OperationalError, ex:
+            except sqlite3.OperationalError as ex:
                 if "locked" not in getSafeExString(ex):
                     raise
             else:
@@ -266,7 +266,7 @@ def setRestAPILog():
         try:
             conf.databaseCursor = Database(conf.database)
             conf.databaseCursor.connect("client")
-        except sqlite3.OperationalError, ex:
+        except sqlite3.OperationalError as ex:
             raise SqlmapConnectionException("%s ('%s')" % (ex, conf.database))
 
         # Set a logging handler that writes log messages to a IPC database
@@ -689,7 +689,7 @@ def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, adapter=REST
             eventlet.monkey_patch()
         logger.debug("Using adapter '%s' to run bottle" % adapter)
         run(host=host, port=port, quiet=True, debug=True, server=adapter)
-    except socket.error, ex:
+    except socket.error as ex:
         if "already in use" in getSafeExString(ex):
             logger.error("Address already in use ('%s:%s')" % (host, port))
         else:
@@ -743,7 +743,7 @@ def client(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, username=Non
 
     try:
         _client(addr)
-    except Exception, ex:
+    except Exception as ex:
         if not isinstance(ex, urllib2.HTTPError) or ex.code == httplib.UNAUTHORIZED:
             errMsg = "There has been a problem while connecting to the "
             errMsg += "REST-JSON API server at '%s' " % addr
@@ -798,7 +798,7 @@ def client(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, username=Non
 
             try:
                 argv = ["sqlmap.py"] + shlex.split(command)[1:]
-            except Exception, ex:
+            except Exception as ex:
                 logger.error("Error occurred while parsing arguments ('%s')" % ex)
                 taskid = None
                 continue
diff --git a/lib/utils/crawler.py b/lib/utils/crawler.py
index 7ceb98a73..12d29522a 100644
--- a/lib/utils/crawler.py
+++ b/lib/utils/crawler.py
@@ -63,14 +63,14 @@ def crawl(target):
                 try:
                     if current:
                         content = Request.getPage(url=current, crawling=True, raise404=False)[0]
-                except SqlmapConnectionException, ex:
+                except SqlmapConnectionException as ex:
                     errMsg = "connection exception detected ('%s'). skipping " % getSafeExString(ex)
                     errMsg += "URL '%s'" % current
                     logger.critical(errMsg)
                 except SqlmapSyntaxException:
                     errMsg = "invalid URL detected. skipping '%s'" % current
                     logger.critical(errMsg)
-                except httplib.InvalidURL, ex:
+                except httplib.InvalidURL as ex:
                     errMsg = "invalid URL detected ('%s'). skipping " % getSafeExString(ex)
                     errMsg += "URL '%s'" % current
                     logger.critical(errMsg)
@@ -138,7 +138,7 @@ def crawl(target):
                 url = urlparse.urljoin(target, "/sitemap.xml")
                 try:
                     items = parseSitemap(url)
-                except SqlmapConnectionException, ex:
+                except SqlmapConnectionException as ex:
                     if "page not found" in getSafeExString(ex):
                         found = False
                         logger.warn("'sitemap.xml' not found")
diff --git a/lib/utils/hash.py b/lib/utils/hash.py
index 4ea776607..78f8e04bb 100644
--- a/lib/utils/hash.py
+++ b/lib/utils/hash.py
@@ -998,7 +998,7 @@ def dictionaryAttack(attack_dict):
 
                     kb.wordlists = dictPaths
 
-                except Exception, ex:
+                except Exception as ex:
                     warnMsg = "there was a problem while loading dictionaries"
                     warnMsg += " ('%s')" % getSafeExString(ex)
                     logger.critical(warnMsg)
diff --git a/lib/utils/hashdb.py b/lib/utils/hashdb.py
index d8206b556..820a21968 100644
--- a/lib/utils/hashdb.py
+++ b/lib/utils/hashdb.py
@@ -41,7 +41,7 @@ class HashDB(object):
                 threadData.hashDBCursor = connection.cursor()
                 threadData.hashDBCursor.execute("CREATE TABLE IF NOT EXISTS storage (id INTEGER PRIMARY KEY, value TEXT)")
                 connection.commit()
-            except Exception, ex:
+            except Exception as ex:
                 errMsg = "error occurred while opening a session "
                 errMsg += "file '%s' ('%s')" % (self.filepath, getSafeExString(ex))
                 raise SqlmapConnectionException(errMsg)
@@ -81,7 +81,7 @@ class HashDB(object):
                     try:
                         for row in self.cursor.execute("SELECT value FROM storage WHERE id=?", (hash_,)):
                             retVal = row[0]
-                    except sqlite3.OperationalError, ex:
+                    except sqlite3.OperationalError as ex:
                         if any(_ in getSafeExString(ex) for _ in ("locked", "no such table")):
                             warnMsg = "problem occurred while accessing session file '%s' ('%s')" % (self.filepath, getSafeExString(ex))
                             singleTimeWarnMessage(warnMsg)
@@ -89,7 +89,7 @@ class HashDB(object):
                             break
                         else:
                             raise
-                    except sqlite3.DatabaseError, ex:
+                    except sqlite3.DatabaseError as ex:
                         errMsg = "error occurred while accessing session file '%s' ('%s'). " % (self.filepath, getSafeExString(ex))
                         errMsg += "If the problem persists please rerun with '--flush-session'"
                         raise SqlmapConnectionException(errMsg)
@@ -141,7 +141,7 @@ class HashDB(object):
                             self.cursor.execute("INSERT INTO storage VALUES (?, ?)", (hash_, value,))
                         except sqlite3.IntegrityError:
                             self.cursor.execute("UPDATE storage SET value=? WHERE id=?", (value, hash_,))
-                    except sqlite3.DatabaseError, ex:
+                    except sqlite3.DatabaseError as ex:
                         if not os.path.exists(self.filepath):
                             debugMsg = "session file '%s' does not exist" % self.filepath
                             logger.debug(debugMsg)
diff --git a/lib/utils/pivotdumptable.py b/lib/utils/pivotdumptable.py
index 8849cbfcd..a60a41754 100644
--- a/lib/utils/pivotdumptable.py
+++ b/lib/utils/pivotdumptable.py
@@ -175,7 +175,7 @@ def pivotDumpTable(table, colList, count=None, blind=True, alias=None):
         warnMsg += "will display partial output"
         logger.warn(warnMsg)
 
-    except SqlmapConnectionException, ex:
+    except SqlmapConnectionException as ex:
         errMsg = "connection exception detected ('%s'). sqlmap " % getSafeExString(ex)
         errMsg += "will display partial output"
 
diff --git a/lib/utils/purge.py b/lib/utils/purge.py
index 5604aba67..248ad0ce8 100644
--- a/lib/utils/purge.py
+++ b/lib/utils/purge.py
@@ -79,5 +79,5 @@ def purge(directory):
 
     try:
         shutil.rmtree(directory)
-    except OSError, ex:
+    except OSError as ex:
         logger.error("problem occurred while removing directory '%s' ('%s')" % (directory, getSafeExString(ex)))
diff --git a/lib/utils/search.py b/lib/utils/search.py
index 24ef82449..872558cd0 100644
--- a/lib/utils/search.py
+++ b/lib/utils/search.py
@@ -54,7 +54,7 @@ def _search(dork):
     try:
         req = urllib2.Request("https://www.google.com/ncr", headers=headers)
         conn = urllib2.urlopen(req)
-    except Exception, ex:
+    except Exception as ex:
         errMsg = "unable to connect to Google ('%s')" % getSafeExString(ex)
         raise SqlmapConnectionException(errMsg)
 
@@ -91,7 +91,7 @@ def _search(dork):
     except urllib2.HTTPError, e:
         try:
             page = e.read()
-        except Exception, ex:
+        except Exception as ex:
             warnMsg = "problem occurred while trying to get "
             warnMsg += "an error page information (%s)" % getSafeExString(ex)
             logger.critical(warnMsg)
@@ -183,7 +183,7 @@ def search(dork):
 
     try:
         return _search(dork)
-    except SqlmapBaseException, ex:
+    except SqlmapBaseException as ex:
         if conf.proxyList:
             logger.critical(getSafeExString(ex))
 
diff --git a/plugins/dbms/oracle/connector.py b/plugins/dbms/oracle/connector.py
index 76d2087bf..748565348 100644
--- a/plugins/dbms/oracle/connector.py
+++ b/plugins/dbms/oracle/connector.py
@@ -43,7 +43,7 @@ class Connector(GenericConnector):
         try:
             self.connector = cx_Oracle.connect(dsn=self.__dsn, user=self.user, password=self.password, mode=cx_Oracle.SYSDBA)
             logger.info("successfully connected as SYSDBA")
-        except (cx_Oracle.OperationalError, cx_Oracle.DatabaseError, cx_Oracle.InterfaceError), ex:
+        except (cx_Oracle.OperationalError, cx_Oracle.DatabaseError, cx_Oracle.InterfaceError) as ex:
             if "Oracle Client library" in str(ex):
                 msg = re.sub(r"DPI-\d+:\s+", "", str(ex))
                 msg = re.sub(r': ("[^"]+")', r" (\g<1>)", msg)
diff --git a/plugins/generic/custom.py b/plugins/generic/custom.py
index fa390b361..dc49e5a50 100644
--- a/plugins/generic/custom.py
+++ b/plugins/generic/custom.py
@@ -70,7 +70,7 @@ class Custom:
 
                 output = NULL
 
-        except SqlmapNoneDataException, ex:
+        except SqlmapNoneDataException as ex:
             logger.warn(ex)
 
         return output
diff --git a/plugins/generic/entries.py b/plugins/generic/entries.py
index 87a4e9444..5c51c06a1 100644
--- a/plugins/generic/entries.py
+++ b/plugins/generic/entries.py
@@ -444,13 +444,13 @@ class Entries:
                                                         "db": safeSQLIdentificatorNaming(conf.db)}
                     try:
                         attackDumpedTable()
-                    except (IOError, OSError), ex:
+                    except (IOError, OSError) as ex:
                         errMsg = "an error occurred while attacking "
                         errMsg += "table dump ('%s')" % getSafeExString(ex)
                         logger.critical(errMsg)
                     conf.dumper.dbTableValues(kb.data.dumpedTable)
 
-            except SqlmapConnectionException, ex:
+            except SqlmapConnectionException as ex:
                 errMsg = "connection exception detected in dumping phase "
                 errMsg += "('%s')" % getSafeExString(ex)
                 logger.critical(errMsg)
diff --git a/plugins/generic/takeover.py b/plugins/generic/takeover.py
index a6d298e37..426de1211 100644
--- a/plugins/generic/takeover.py
+++ b/plugins/generic/takeover.py
@@ -140,7 +140,7 @@ class Takeover(Abstraction, Metasploit, ICMPsh, Registry, Miscellaneous):
                 try:
                     with open(filename, "wb") as f:
                         f.write("1")
-                except IOError, ex:
+                except IOError as ex:
                     errMsg = "there has been a file opening/writing error "
                     errMsg += "for filename '%s' ('%s')" % (filename, getSafeExString(ex))
                     raise SqlmapSystemException(errMsg)
diff --git a/thirdparty/clientform/clientform.py b/thirdparty/clientform/clientform.py
index 59d2d59ca..228c36daf 100644
--- a/thirdparty/clientform/clientform.py
+++ b/thirdparty/clientform/clientform.py
@@ -1141,7 +1141,7 @@ def _ParseFileEx(file, base_uri,
     for form in forms:
         try:
             form.fixup()
-        except AttributeError, ex:
+        except AttributeError as ex:
             if not any(_ in str(ex) for _ in ("is disabled", "is readonly")):
                 raise
     return forms
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index c7145c32f..1cbe56b4e 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -5,7 +5,7 @@ fb6be55d21a70765e35549af2484f762  extra/cloak/__init__.py
 6baecbea87de0a56f99e59bfe982ebc5  extra/dbgtool/dbgtool.py
 fb6be55d21a70765e35549af2484f762  extra/dbgtool/__init__.py
 acba8b5dc93db0fe6b2b04ff0138c33c  extra/icmpsh/icmpsh.exe_
-708e9fd35dabcbfcd10e91bbc14f091f  extra/icmpsh/icmpsh_m.py
+216a0e04bef7053e6aa35ca98907007e  extra/icmpsh/icmpsh_m.py
 2d020d2bdcee1170805f48839fdb89df  extra/icmpsh/__init__.py
 fb6be55d21a70765e35549af2484f762  extra/__init__.py
 ff90cb0366f7cefbdd6e573e27e6238c  extra/runcmd/runcmd.exe_
@@ -21,64 +21,64 @@ e4805169a081b834ca51a60a150c7247  extra/shutils/newlines.py
 fb6be55d21a70765e35549af2484f762  extra/sqlharvest/__init__.py
 53d5dcba047f1285e32b9e88d2803ebf  extra/sqlharvest/sqlharvest.py
 fb6be55d21a70765e35549af2484f762  extra/wafdetectify/__init__.py
-f73623c18b7f6ebb71f10e124b1b93c9  extra/wafdetectify/wafdetectify.py
-d0f2b424f5b2b06f26cdd7076d61be6e  lib/controller/action.py
-eaccf6204d8c44cee9daba955af0c85e  lib/controller/checks.py
-3c18f0b1d1b9fda682201a264f170b31  lib/controller/controller.py
-e97a9d34fef5761a8eab6432ce3c7c53  lib/controller/handler.py
+d7e3aa3221c5ddb106a029720bf9fb5e  extra/wafdetectify/wafdetectify.py
+ec782b9cdb8d857a80b6ecf0f32db7f4  lib/controller/action.py
+d62df9d0d5643d67b75f836ea87827c7  lib/controller/checks.py
+c4d559a98cfc62b401ef7e0bfab782f0  lib/controller/controller.py
+c1da277517c7ec4c23e953a51b51e203  lib/controller/handler.py
 fb6be55d21a70765e35549af2484f762  lib/controller/__init__.py
 ed7874be0d2d3802f3d20184f2b280d5  lib/core/agent.py
-fdabbf8dda7277e5f4e3d0a6252cffb6  lib/core/bigarray.py
-4706fb856c1662ef5afd747544d0d8cb  lib/core/common.py
+44ac129c1b3b6130b4f1bc7b93036278  lib/core/bigarray.py
+5da00a381cc1847201ffbeb663653ecd  lib/core/common.py
 de8d27ae6241163ff9e97aa9e7c51a18  lib/core/convert.py
 abcb1121eb56d3401839d14e8ed06b6e  lib/core/data.py
 db60c6ebb63b72ed119e304b359fc1a6  lib/core/datatype.py
 b7c912e2af7a3354f6d7c04f556a80b2  lib/core/decorators.py
 5f4680b769ae07f22157bd832c97cf8f  lib/core/defaults.py
 9dfc69ba47209a4ceca494dde9ee8183  lib/core/dicts.py
-040895bafa05783ca1a2e6c74d6de2c6  lib/core/dump.py
+070e9439a18d2d9067e3a135b239fa3f  lib/core/dump.py
 5c91145204092b995ed1ac641e9e291d  lib/core/enums.py
 84ef8f32e4582fcc294dc14e1997131d  lib/core/exception.py
 fb6be55d21a70765e35549af2484f762  lib/core/__init__.py
 18c896b157b03af716542e5fe9233ef9  lib/core/log.py
 fa9f24e88c81a6cef52da3dd5e637010  lib/core/optiondict.py
-8867c1cb5a045cea99d8a9a7ceea6abf  lib/core/option.py
+95f9836ad46146537cc16f918a002118  lib/core/option.py
 fe370021c6bc99daf44b2bfc0d1effb3  lib/core/patch.py
 0f1d79ada721cf6def611b21b03d68af  lib/core/profiling.py
 5e2c16a8e2daee22dd545df13386e7a3  lib/core/readlineng.py
-9a7d68d5fa01561500423791f15cc676  lib/core/replication.py
+7d8a22c582ad201f65b73225e4456170  lib/core/replication.py
 3179d34f371e0295dd4604568fb30bcd  lib/core/revision.py
 d6269c55789f78cf707e09a0f5b45443  lib/core/session.py
-a6c91e706b0c752a7c89ed1a5737b8e6  lib/core/settings.py
+71bd4886e45f4d0f6d9f556c12a06c7f  lib/core/settings.py
 a8a7501d1e6b21669b858a62e921d191  lib/core/shell.py
 5dc606fdf0afefd4b305169c21ab2612  lib/core/subprocessng.py
-eec3080ba5baca44c6de4595f1c92a0d  lib/core/target.py
+2d29cdb5e7bc612b2ade8e4ab0b1495e  lib/core/target.py
 a71b23612f2f2c7be8a843858408fdcc  lib/core/testing.py
-5ebd996b2a77449df90320847e30a073  lib/core/threads.py
+bf4bdec9b247a999f877a5e5d7daeb70  lib/core/threads.py
 2c263c8610667fdc593c50a35ab20f57  lib/core/unescaper.py
-5bd7cd6553a4a1c85cbaaddc268108e4  lib/core/update.py
-5232b05d5c42a0e5a5a2d5952c6c39a5  lib/core/wordlist.py
+ff45c74515fecc95277f7b9ad945f17c  lib/core/update.py
+b40f4c20a38729bb4933b8221665f106  lib/core/wordlist.py
 fb6be55d21a70765e35549af2484f762  lib/__init__.py
 4881480d0c1778053908904e04570dc3  lib/parse/banner.py
-65a5b384bc3d545b366b344eddeb0805  lib/parse/cmdline.py
-85e44fc7673a661305909a85ed24c5ae  lib/parse/configfile.py
+80c67d8d0add0097fd0284f043eee939  lib/parse/cmdline.py
+06ccbccb63255c8f1c35950a4c8a6f6b  lib/parse/configfile.py
 9b33e52f697d6e915c7a10153562ce89  lib/parse/handler.py
 43deb2400e269e602e916efaec7c0903  lib/parse/headers.py
 77e802323ffa718dd9c27512656c0a70  lib/parse/html.py
 fb6be55d21a70765e35549af2484f762  lib/parse/__init__.py
-92b55cf4246ae7ff6651ac8deb4a0ac5  lib/parse/payloads.py
+adcecd2d6a8667b22872a563eb83eac0  lib/parse/payloads.py
 993104046c7d97120613409ef7780c76  lib/parse/sitemap.py
 e4ea70bcd461f5176867dcd89d372386  lib/request/basicauthhandler.py
 6076c01e84b589adb97cac421a7d5251  lib/request/basic.py
 fc25d951217077fe655ed2a3a81552ae  lib/request/comparison.py
-8e7f52dd4ef26f90310fc1082e17f4f8  lib/request/connect.py
+2192d65f4a8ba15c081e12590b6e517f  lib/request/connect.py
 7cba86090b02558f04c6692cef66e772  lib/request/direct.py
-0a5cc34a7bbe709684ce32b4b46afd32  lib/request/dns.py
-7bab2719ef2a6f1ddd838fa2335ae635  lib/request/httpshandler.py
+4c7afe3d4be0c2d767b11df36b46bbcc  lib/request/dns.py
+ceac6b3bf1f726f8ff43c6814e9d7281  lib/request/httpshandler.py
 fb6be55d21a70765e35549af2484f762  lib/request/__init__.py
 00720f9eddf42f4fefa083fba40f69ed  lib/request/inject.py
 52a067bd2fe91ea9395269a684380cbb  lib/request/methodrequest.py
-321786eeb43821106e41fc72bd4f9901  lib/request/pkihandler.py
+ac482ec52227daf48f523827dd67078f  lib/request/pkihandler.py
 16ff6e078819fe517b1fc0ae3cbc1aa8  lib/request/rangehandler.py
 e79048c2a08c1a47efd5652f59c4417d  lib/request/redirecthandler.py
 1e60edebdb3997055616d12f4a932375  lib/request/templates.py
@@ -101,20 +101,20 @@ fb6be55d21a70765e35549af2484f762  lib/techniques/__init__.py
 fb6be55d21a70765e35549af2484f762  lib/techniques/union/__init__.py
 baa3946c23749d898f473dba0f4eecff  lib/techniques/union/test.py
 d32988e13713417286ab83a00856858e  lib/techniques/union/use.py
-bf5e2a2b265c0d8b9f054c94fb74dcb9  lib/utils/api.py
+31d0ac4f92d4ffddf9936499829484cc  lib/utils/api.py
 544dee96e782560fe4355cbf6ee19b8c  lib/utils/brute.py
-ac0780394af107b9a516463efc4de2e5  lib/utils/crawler.py
+b27421eb57cea711050135f84be99258  lib/utils/crawler.py
 da4bc159e6920f1f7e45c92c39941690  lib/utils/deps.py
 f7c64515a3e4fcfe8266ca2be77be565  lib/utils/getch.py
 0d497906b06eb82d14da676e9f9c98f5  lib/utils/har.py
-1fc47aa8860f809d103048e4eb51cdd2  lib/utils/hashdb.py
-ef3fadd11bc45552d26f00b34f732097  lib/utils/hash.py
+d11f7f208ccf3a7753ccc417b4b01901  lib/utils/hashdb.py
+3302ee15997023b20babaa7c67e6b0b8  lib/utils/hash.py
 17009289bb5c0dc0cceaa483113101e1  lib/utils/htmlentities.py
 fb6be55d21a70765e35549af2484f762  lib/utils/__init__.py
-2a40a6bd1779f7db5199f089411b1c1c  lib/utils/pivotdumptable.py
+833b05c72c9fa60b0a25b0a26f8f31fb  lib/utils/pivotdumptable.py
 5a8902fd6fa94ea73cf44952f9ed5a57  lib/utils/progress.py
-a41136344768902f82b2855e88fd228d  lib/utils/purge.py
-631aa9e193e459875528fee78e9a770b  lib/utils/search.py
+b79654e49850937ab2dc8e0d73625cab  lib/utils/purge.py
+081765fc1b3ad8a63f72e9c0e02ff00e  lib/utils/search.py
 8d6b244ca3d6f99a9d6cd8c1856ccfeb  lib/utils/sqlalchemy.py
 a90c568a9b88eaea832a77581bd39d85  lib/utils/timeout.py
 164f830baad3e13b226ee57d44d69dfa  lib/utils/versioncheck.py
@@ -183,7 +183,7 @@ fd79ec2504b6bada7d2da233a549af53  plugins/dbms/mysql/fingerprint.py
 040835bde6be85ebc1a6667dcd08940e  plugins/dbms/mysql/__init__.py
 dd6bd1d3d561755b96e953ede16cb8fc  plugins/dbms/mysql/syntax.py
 6c91ef5b5a6cd29cef4bd9bc3c369454  plugins/dbms/mysql/takeover.py
-fba38967a03e30a162660dd3685a46f2  plugins/dbms/oracle/connector.py
+6e6c992f7fff55a8aa79d14437c648e7  plugins/dbms/oracle/connector.py
 3266e81eb4a3c083d27c7a255be38893  plugins/dbms/oracle/enumeration.py
 5bdd5288c8303ea21a5f8409332e32a1  plugins/dbms/oracle/filesystem.py
 8813f44f3b67fc98024199c7b8398811  plugins/dbms/oracle/fingerprint.py
@@ -212,9 +212,9 @@ d2391dfe74f053eb5f31b0efad3fdda0  plugins/dbms/sqlite/connector.py
 ec3f406591fc9472f5750bd40993e72e  plugins/dbms/sybase/syntax.py
 369476221b3059106410de05766227e0  plugins/dbms/sybase/takeover.py
 147f6af265f6b5412bbd7aaebef95881  plugins/generic/connector.py
-e492c91101cecd66c9f6a630eab85368  plugins/generic/custom.py
+54ac71c46c67c81196e2e6707e0989cf  plugins/generic/custom.py
 a3fd48c7094fca6692be8b1ae5e29cea  plugins/generic/databases.py
-6283b356e6055bb9071f00cdf66dea24  plugins/generic/entries.py
+9c2c830b3cf66953ecffa6cf88fc7c14  plugins/generic/entries.py
 f3624debb8ae6fbcfb5f1b7f1d0743d1  plugins/generic/enumeration.py
 cda119b7b0d1afeb60f912009cdb0cf5  plugins/generic/filesystem.py
 65e75cd3c2c7acffa6ac13b086e0f383  plugins/generic/fingerprint.py
@@ -222,7 +222,7 @@ fb6be55d21a70765e35549af2484f762  plugins/generic/__init__.py
 de1928d6865547764ae9a896da4bf1d4  plugins/generic/misc.py
 8bc2b5dfbc4c644ed95adfe8099ee067  plugins/generic/search.py
 1989f6cbed217f4222dc2dce72992d91  plugins/generic/syntax.py
-d152384fffebfa010188707bf683cd3c  plugins/generic/takeover.py
+44c388ea08d4296e2bf2706e19cbe64a  plugins/generic/takeover.py
 a4b9f764140e89279e3d0dace99bfa5f  plugins/generic/users.py
 fb6be55d21a70765e35549af2484f762  plugins/__init__.py
 5dc693e22f5d020c5c568d7325bd4226  shell/backdoors/backdoor.asp_
@@ -336,7 +336,7 @@ ee25f2a03587e2c283eab0b36c9e5783  thirdparty/chardet/sbcsgroupprober.py
 c9349824f2647962175d321cc0c52134  thirdparty/chardet/sjisprober.py
 bcae4c645a737d3f0e7c96a66528ca4a  thirdparty/chardet/universaldetector.py
 6f8b3e25472c02fb45a75215a175991f  thirdparty/chardet/utf8prober.py
-3c1b0d627e98643b317244ecfd240bb5  thirdparty/clientform/clientform.py
+9df18debb6b5c5c0caff3d126958c8d7  thirdparty/clientform/clientform.py
 722281d87fb13ec22555480f8f4c715b  thirdparty/clientform/__init__.py
 0b625ccefa6b066f79d3cbb3639267e6  thirdparty/colorama/ansi.py
 93bb7f06c8300a91b533ea55e8aead43  thirdparty/colorama/ansitowin32.py