From 9c247b3833a0ed501c50966e8aaed0e4da4ab7ae Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 8 May 2019 12:47:52 +0200
Subject: [PATCH] Last preparations for DREI

---
 extra/__init__.py                       | 2 +-
 extra/safe2bin/__init__.py              | 2 +-
 extra/safe2bin/safe2bin.py              | 2 +-
 lib/__init__.py                         | 2 +-
 lib/controller/__init__.py              | 2 +-
 lib/controller/action.py                | 2 +-
 lib/controller/checks.py                | 2 +-
 lib/controller/controller.py            | 2 +-
 lib/controller/handler.py               | 2 +-
 lib/core/__init__.py                    | 2 +-
 lib/core/agent.py                       | 2 +-
 lib/core/bigarray.py                    | 2 +-
 lib/core/common.py                      | 2 +-
 lib/core/compat.py                      | 2 +-
 lib/core/convert.py                     | 2 +-
 lib/core/data.py                        | 2 +-
 lib/core/datatype.py                    | 2 +-
 lib/core/decorators.py                  | 2 +-
 lib/core/defaults.py                    | 2 +-
 lib/core/dicts.py                       | 2 +-
 lib/core/dump.py                        | 2 +-
 lib/core/enums.py                       | 2 +-
 lib/core/exception.py                   | 2 +-
 lib/core/log.py                         | 2 +-
 lib/core/option.py                      | 2 +-
 lib/core/optiondict.py                  | 2 +-
 lib/core/patch.py                       | 2 +-
 lib/core/profiling.py                   | 2 +-
 lib/core/readlineng.py                  | 2 +-
 lib/core/replication.py                 | 2 +-
 lib/core/revision.py                    | 2 +-
 lib/core/session.py                     | 2 +-
 lib/core/settings.py                    | 4 ++--
 lib/core/shell.py                       | 2 +-
 lib/core/subprocessng.py                | 2 +-
 lib/core/target.py                      | 2 +-
 lib/core/testing.py                     | 2 +-
 lib/core/threads.py                     | 2 +-
 lib/core/unescaper.py                   | 2 +-
 lib/core/update.py                      | 2 +-
 lib/core/wordlist.py                    | 2 +-
 lib/parse/__init__.py                   | 2 +-
 lib/parse/banner.py                     | 2 +-
 lib/parse/cmdline.py                    | 2 +-
 lib/parse/configfile.py                 | 2 +-
 lib/parse/handler.py                    | 2 +-
 lib/parse/headers.py                    | 2 +-
 lib/parse/html.py                       | 2 +-
 lib/parse/payloads.py                   | 2 +-
 lib/parse/sitemap.py                    | 2 +-
 lib/request/__init__.py                 | 2 +-
 lib/request/basic.py                    | 2 +-
 lib/request/basicauthhandler.py         | 2 +-
 lib/request/chunkedhandler.py           | 2 +-
 lib/request/comparison.py               | 2 +-
 lib/request/connect.py                  | 2 +-
 lib/request/direct.py                   | 2 +-
 lib/request/dns.py                      | 2 +-
 lib/request/httpshandler.py             | 2 +-
 lib/request/inject.py                   | 2 +-
 lib/request/methodrequest.py            | 2 +-
 lib/request/pkihandler.py               | 2 +-
 lib/request/rangehandler.py             | 2 +-
 lib/request/redirecthandler.py          | 2 +-
 lib/request/templates.py                | 2 +-
 lib/takeover/__init__.py                | 2 +-
 lib/takeover/abstraction.py             | 2 +-
 lib/takeover/icmpsh.py                  | 2 +-
 lib/takeover/metasploit.py              | 2 +-
 lib/takeover/registry.py                | 2 +-
 lib/takeover/udf.py                     | 2 +-
 lib/takeover/web.py                     | 2 +-
 lib/takeover/xp_cmdshell.py             | 2 +-
 lib/techniques/__init__.py              | 2 +-
 lib/techniques/blind/__init__.py        | 2 +-
 lib/techniques/blind/inference.py       | 2 +-
 lib/techniques/dns/__init__.py          | 2 +-
 lib/techniques/dns/test.py              | 2 +-
 lib/techniques/dns/use.py               | 2 +-
 lib/techniques/error/__init__.py        | 2 +-
 lib/techniques/error/use.py             | 2 +-
 lib/techniques/union/__init__.py        | 2 +-
 lib/techniques/union/test.py            | 2 +-
 lib/techniques/union/use.py             | 2 +-
 lib/utils/__init__.py                   | 2 +-
 lib/utils/api.py                        | 2 +-
 lib/utils/brute.py                      | 2 +-
 lib/utils/crawler.py                    | 2 +-
 lib/utils/deps.py                       | 2 +-
 lib/utils/getch.py                      | 2 +-
 lib/utils/har.py                        | 2 +-
 lib/utils/hash.py                       | 2 +-
 lib/utils/hashdb.py                     | 2 +-
 lib/utils/htmlentities.py               | 2 +-
 lib/utils/pivotdumptable.py             | 2 +-
 lib/utils/progress.py                   | 2 +-
 lib/utils/purge.py                      | 2 +-
 lib/utils/search.py                     | 2 +-
 lib/utils/sqlalchemy.py                 | 2 +-
 lib/utils/timeout.py                    | 2 +-
 lib/utils/versioncheck.py               | 2 +-
 plugins/__init__.py                     | 2 +-
 plugins/dbms/__init__.py                | 2 +-
 plugins/dbms/access/__init__.py         | 2 +-
 plugins/dbms/access/connector.py        | 2 +-
 plugins/dbms/access/enumeration.py      | 2 +-
 plugins/dbms/access/filesystem.py       | 2 +-
 plugins/dbms/access/fingerprint.py      | 2 +-
 plugins/dbms/access/syntax.py           | 2 +-
 plugins/dbms/access/takeover.py         | 2 +-
 plugins/dbms/db2/__init__.py            | 2 +-
 plugins/dbms/db2/connector.py           | 2 +-
 plugins/dbms/db2/enumeration.py         | 2 +-
 plugins/dbms/db2/filesystem.py          | 2 +-
 plugins/dbms/db2/fingerprint.py         | 2 +-
 plugins/dbms/db2/syntax.py              | 2 +-
 plugins/dbms/db2/takeover.py            | 2 +-
 plugins/dbms/firebird/__init__.py       | 2 +-
 plugins/dbms/firebird/connector.py      | 2 +-
 plugins/dbms/firebird/enumeration.py    | 2 +-
 plugins/dbms/firebird/filesystem.py     | 2 +-
 plugins/dbms/firebird/fingerprint.py    | 2 +-
 plugins/dbms/firebird/syntax.py         | 2 +-
 plugins/dbms/firebird/takeover.py       | 2 +-
 plugins/dbms/h2/__init__.py             | 2 +-
 plugins/dbms/h2/connector.py            | 2 +-
 plugins/dbms/h2/enumeration.py          | 2 +-
 plugins/dbms/h2/filesystem.py           | 2 +-
 plugins/dbms/h2/fingerprint.py          | 2 +-
 plugins/dbms/h2/syntax.py               | 2 +-
 plugins/dbms/h2/takeover.py             | 2 +-
 plugins/dbms/hsqldb/__init__.py         | 2 +-
 plugins/dbms/hsqldb/connector.py        | 2 +-
 plugins/dbms/hsqldb/enumeration.py      | 2 +-
 plugins/dbms/hsqldb/filesystem.py       | 2 +-
 plugins/dbms/hsqldb/fingerprint.py      | 2 +-
 plugins/dbms/hsqldb/syntax.py           | 2 +-
 plugins/dbms/hsqldb/takeover.py         | 2 +-
 plugins/dbms/informix/__init__.py       | 2 +-
 plugins/dbms/informix/connector.py      | 2 +-
 plugins/dbms/informix/enumeration.py    | 2 +-
 plugins/dbms/informix/filesystem.py     | 2 +-
 plugins/dbms/informix/fingerprint.py    | 2 +-
 plugins/dbms/informix/syntax.py         | 2 +-
 plugins/dbms/informix/takeover.py       | 2 +-
 plugins/dbms/maxdb/__init__.py          | 2 +-
 plugins/dbms/maxdb/connector.py         | 2 +-
 plugins/dbms/maxdb/enumeration.py       | 2 +-
 plugins/dbms/maxdb/filesystem.py        | 2 +-
 plugins/dbms/maxdb/fingerprint.py       | 2 +-
 plugins/dbms/maxdb/syntax.py            | 2 +-
 plugins/dbms/maxdb/takeover.py          | 2 +-
 plugins/dbms/mssqlserver/__init__.py    | 2 +-
 plugins/dbms/mssqlserver/connector.py   | 2 +-
 plugins/dbms/mssqlserver/enumeration.py | 2 +-
 plugins/dbms/mssqlserver/filesystem.py  | 2 +-
 plugins/dbms/mssqlserver/fingerprint.py | 2 +-
 plugins/dbms/mssqlserver/syntax.py      | 2 +-
 plugins/dbms/mssqlserver/takeover.py    | 2 +-
 plugins/dbms/mysql/__init__.py          | 2 +-
 plugins/dbms/mysql/connector.py         | 2 +-
 plugins/dbms/mysql/enumeration.py       | 2 +-
 plugins/dbms/mysql/filesystem.py        | 2 +-
 plugins/dbms/mysql/fingerprint.py       | 2 +-
 plugins/dbms/mysql/syntax.py            | 2 +-
 plugins/dbms/mysql/takeover.py          | 2 +-
 plugins/dbms/oracle/__init__.py         | 2 +-
 plugins/dbms/oracle/connector.py        | 2 +-
 plugins/dbms/oracle/enumeration.py      | 2 +-
 plugins/dbms/oracle/filesystem.py       | 2 +-
 plugins/dbms/oracle/fingerprint.py      | 2 +-
 plugins/dbms/oracle/syntax.py           | 2 +-
 plugins/dbms/oracle/takeover.py         | 2 +-
 plugins/dbms/postgresql/__init__.py     | 2 +-
 plugins/dbms/postgresql/connector.py    | 2 +-
 plugins/dbms/postgresql/enumeration.py  | 2 +-
 plugins/dbms/postgresql/filesystem.py   | 2 +-
 plugins/dbms/postgresql/fingerprint.py  | 2 +-
 plugins/dbms/postgresql/syntax.py       | 2 +-
 plugins/dbms/postgresql/takeover.py     | 2 +-
 plugins/dbms/sqlite/__init__.py         | 2 +-
 plugins/dbms/sqlite/connector.py        | 2 +-
 plugins/dbms/sqlite/enumeration.py      | 2 +-
 plugins/dbms/sqlite/filesystem.py       | 2 +-
 plugins/dbms/sqlite/fingerprint.py      | 2 +-
 plugins/dbms/sqlite/syntax.py           | 2 +-
 plugins/dbms/sqlite/takeover.py         | 2 +-
 plugins/dbms/sybase/__init__.py         | 2 +-
 plugins/dbms/sybase/connector.py        | 2 +-
 plugins/dbms/sybase/enumeration.py      | 2 +-
 plugins/dbms/sybase/filesystem.py       | 2 +-
 plugins/dbms/sybase/fingerprint.py      | 2 +-
 plugins/dbms/sybase/syntax.py           | 2 +-
 plugins/dbms/sybase/takeover.py         | 2 +-
 plugins/generic/__init__.py             | 2 +-
 plugins/generic/connector.py            | 2 +-
 plugins/generic/custom.py               | 2 +-
 plugins/generic/databases.py            | 2 +-
 plugins/generic/entries.py              | 2 +-
 plugins/generic/enumeration.py          | 2 +-
 plugins/generic/filesystem.py           | 2 +-
 plugins/generic/fingerprint.py          | 2 +-
 plugins/generic/misc.py                 | 2 +-
 plugins/generic/search.py               | 2 +-
 plugins/generic/syntax.py               | 2 +-
 plugins/generic/takeover.py             | 2 +-
 plugins/generic/users.py                | 2 +-
 sqlmap.py                               | 2 +-
 sqlmapapi.py                            | 2 +-
 tamper/__init__.py                      | 2 +-
 tamper/apostrophemask.py                | 2 +-
 tamper/apostrophenullencode.py          | 2 +-
 tamper/appendnullbyte.py                | 2 +-
 tamper/base64encode.py                  | 2 +-
 tamper/between.py                       | 2 +-
 tamper/bluecoat.py                      | 2 +-
 tamper/chardoubleencode.py              | 2 +-
 tamper/charencode.py                    | 2 +-
 tamper/charunicodeencode.py             | 2 +-
 tamper/charunicodeescape.py             | 2 +-
 tamper/commalesslimit.py                | 2 +-
 tamper/commalessmid.py                  | 2 +-
 tamper/commentbeforeparentheses.py      | 2 +-
 tamper/concat2concatws.py               | 2 +-
 tamper/equaltolike.py                   | 2 +-
 tamper/escapequotes.py                  | 2 +-
 tamper/greatest.py                      | 2 +-
 tamper/halfversionedmorekeywords.py     | 2 +-
 tamper/hex2char.py                      | 2 +-
 tamper/htmlencode.py                    | 2 +-
 tamper/ifnull2casewhenisnull.py         | 2 +-
 tamper/ifnull2ifisnull.py               | 2 +-
 tamper/informationschemacomment.py      | 2 +-
 tamper/least.py                         | 2 +-
 tamper/lowercase.py                     | 2 +-
 tamper/luanginx.py                      | 2 +-
 tamper/modsecurityversioned.py          | 2 +-
 tamper/modsecurityzeroversioned.py      | 2 +-
 tamper/multiplespaces.py                | 2 +-
 tamper/overlongutf8.py                  | 2 +-
 tamper/overlongutf8more.py              | 2 +-
 tamper/percentage.py                    | 2 +-
 tamper/plus2concat.py                   | 2 +-
 tamper/plus2fnconcat.py                 | 2 +-
 tamper/randomcase.py                    | 2 +-
 tamper/randomcomments.py                | 2 +-
 tamper/sp_password.py                   | 2 +-
 tamper/space2comment.py                 | 2 +-
 tamper/space2dash.py                    | 2 +-
 tamper/space2hash.py                    | 2 +-
 tamper/space2morecomment.py             | 2 +-
 tamper/space2morehash.py                | 2 +-
 tamper/space2mssqlblank.py              | 2 +-
 tamper/space2mssqlhash.py               | 2 +-
 tamper/space2mysqlblank.py              | 2 +-
 tamper/space2mysqldash.py               | 2 +-
 tamper/space2plus.py                    | 2 +-
 tamper/space2randomblank.py             | 2 +-
 tamper/substring2leftright.py           | 2 +-
 tamper/symboliclogical.py               | 2 +-
 tamper/unionalltounion.py               | 2 +-
 tamper/unmagicquotes.py                 | 2 +-
 tamper/uppercase.py                     | 2 +-
 tamper/varnish.py                       | 2 +-
 tamper/versionedkeywords.py             | 2 +-
 tamper/versionedmorekeywords.py         | 2 +-
 tamper/xforwardedfor.py                 | 2 +-
 thirdparty/bottle/bottle.py             | 2 +-
 thirdparty/chardet/chardetect.py        | 2 +-
 thirdparty/fcrypt/__init__.py           | 2 +-
 thirdparty/keepalive/__init__.py        | 2 +-
 thirdparty/keepalive/keepalive.py       | 2 +-
 thirdparty/multipart/multipartpost.py   | 2 +-
 thirdparty/odict/__init__.py            | 2 +-
 thirdparty/prettyprint/__init__.py      | 2 +-
 thirdparty/prettyprint/prettyprint.py   | 2 +-
 thirdparty/pydes/__init__.py            | 2 +-
 thirdparty/socks/socks.py               | 2 +-
 thirdparty/wininetpton/__init__.py      | 2 +-
 thirdparty/wininetpton/win_inet_pton.py | 2 +-
 waf/360.py                              | 2 +-
 waf/__init__.py                         | 2 +-
 waf/aesecure.py                         | 2 +-
 waf/airlock.py                          | 2 +-
 waf/anquanbao.py                        | 2 +-
 waf/approach.py                         | 2 +-
 waf/armor.py                            | 2 +-
 waf/asm.py                              | 2 +-
 waf/astra.py                            | 2 +-
 waf/aws.py                              | 2 +-
 waf/barracuda.py                        | 2 +-
 waf/bekchy.py                           | 2 +-
 waf/bitninja.py                         | 2 +-
 waf/bluedon.py                          | 2 +-
 waf/cerber.py                           | 2 +-
 waf/chinacache.py                       | 2 +-
 waf/ciscoacexml.py                      | 2 +-
 waf/cloudbric.py                        | 2 +-
 waf/cloudflare.py                       | 2 +-
 waf/cloudfront.py                       | 2 +-
 waf/comodo.py                           | 2 +-
 waf/crawlprotect.py                     | 2 +-
 waf/distil.py                           | 2 +-
 waf/dotdefender.py                      | 2 +-
 waf/edgecast.py                         | 2 +-
 waf/expressionengine.py                 | 2 +-
 waf/fortiweb.py                         | 2 +-
 waf/generic.py                          | 2 +-
 waf/godaddy.py                          | 2 +-
 waf/greywizard.py                       | 2 +-
 waf/imunify360.py                       | 2 +-
 waf/incapsula.py                        | 2 +-
 waf/isaserver.py                        | 2 +-
 waf/janusec.py                          | 2 +-
 waf/jiasule.py                          | 2 +-
 waf/knownsec.py                         | 2 +-
 waf/kona.py                             | 2 +-
 waf/malcare.py                          | 2 +-
 waf/modsecurity.py                      | 2 +-
 waf/naxsi.py                            | 2 +-
 waf/netscaler.py                        | 2 +-
 waf/newdefend.py                        | 2 +-
 waf/ninjafirewall.py                    | 2 +-
 waf/onmessageshield.py                  | 2 +-
 waf/paloalto.py                         | 2 +-
 waf/perimeterx.py                       | 2 +-
 waf/profense.py                         | 2 +-
 waf/proventia.py                        | 2 +-
 waf/radware.py                          | 2 +-
 waf/reblaze.py                          | 2 +-
 waf/requestvalidationmode.py            | 2 +-
 waf/rsfirewall.py                       | 2 +-
 waf/safe3.py                            | 2 +-
 waf/safedog.py                          | 2 +-
 waf/safeline.py                         | 2 +-
 waf/secureentry.py                      | 2 +-
 waf/secureiis.py                        | 2 +-
 waf/securesphere.py                     | 2 +-
 waf/senginx.py                          | 2 +-
 waf/shieldsecurity.py                   | 2 +-
 waf/siteground.py                       | 2 +-
 waf/siteguard.py                        | 2 +-
 waf/sitelock.py                         | 2 +-
 waf/sonicwall.py                        | 2 +-
 waf/sophos.py                           | 2 +-
 waf/squarespace.py                      | 2 +-
 waf/stackpath.py                        | 2 +-
 waf/sucuri.py                           | 2 +-
 waf/tencent.py                          | 2 +-
 waf/trafficshield.py                    | 2 +-
 waf/urlmaster.py                        | 2 +-
 waf/urlscan.py                          | 2 +-
 waf/varnish.py                          | 2 +-
 waf/virusdie.py                         | 2 +-
 waf/wallarm.py                          | 2 +-
 waf/watchguard.py                       | 2 +-
 waf/webknight.py                        | 2 +-
 waf/webseal.py                          | 2 +-
 waf/wordfence.py                        | 2 +-
 waf/wts.py                              | 2 +-
 waf/yundun.py                           | 2 +-
 waf/yunsuo.py                           | 2 +-
 waf/zenedge.py                          | 2 +-
 363 files changed, 364 insertions(+), 364 deletions(-)

diff --git a/extra/__init__.py b/extra/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/extra/__init__.py
+++ b/extra/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/extra/safe2bin/__init__.py b/extra/safe2bin/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/extra/safe2bin/__init__.py
+++ b/extra/safe2bin/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/extra/safe2bin/safe2bin.py b/extra/safe2bin/safe2bin.py
index 1aca82d4d..7fbf7cf69 100644
--- a/extra/safe2bin/safe2bin.py
+++ b/extra/safe2bin/safe2bin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 safe2bin.py - Simple safe(hex) to binary format converter
diff --git a/lib/__init__.py b/lib/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/controller/__init__.py b/lib/controller/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/controller/__init__.py
+++ b/lib/controller/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/controller/action.py b/lib/controller/action.py
index 14182cebc..6c370c738 100644
--- a/lib/controller/action.py
+++ b/lib/controller/action.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index 1fc5e9d32..4707f6dc5 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index e67cc7d07..7e6be8ad7 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/controller/handler.py b/lib/controller/handler.py
index 170bf9ed6..6ab21b71a 100644
--- a/lib/controller/handler.py
+++ b/lib/controller/handler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/__init__.py b/lib/core/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/core/__init__.py
+++ b/lib/core/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/agent.py b/lib/core/agent.py
index d79209bc6..165821379 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/bigarray.py b/lib/core/bigarray.py
index 90874bd55..95c602711 100644
--- a/lib/core/bigarray.py
+++ b/lib/core/bigarray.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/common.py b/lib/core/common.py
index a1c1ef56d..81c831bd7 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/compat.py b/lib/core/compat.py
index 385c8f4ec..d1403b302 100644
--- a/lib/core/compat.py
+++ b/lib/core/compat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/convert.py b/lib/core/convert.py
index c46506f78..84073b66d 100644
--- a/lib/core/convert.py
+++ b/lib/core/convert.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/data.py b/lib/core/data.py
index 9f10d20a7..3a56c7fb4 100644
--- a/lib/core/data.py
+++ b/lib/core/data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/datatype.py b/lib/core/datatype.py
index 0aa4bd611..0fc30d817 100644
--- a/lib/core/datatype.py
+++ b/lib/core/datatype.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/decorators.py b/lib/core/decorators.py
index 7c2ea82a1..cab8548f4 100644
--- a/lib/core/decorators.py
+++ b/lib/core/decorators.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/defaults.py b/lib/core/defaults.py
index 50ab6bb19..95a7f3ff4 100644
--- a/lib/core/defaults.py
+++ b/lib/core/defaults.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/dicts.py b/lib/core/dicts.py
index 18c28d722..e80f3d9a0 100644
--- a/lib/core/dicts.py
+++ b/lib/core/dicts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/dump.py b/lib/core/dump.py
index 33adf333b..9b227b1c0 100644
--- a/lib/core/dump.py
+++ b/lib/core/dump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/enums.py b/lib/core/enums.py
index 18510404c..a13dbcd1e 100644
--- a/lib/core/enums.py
+++ b/lib/core/enums.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/exception.py b/lib/core/exception.py
index 3d0dd5e23..ad87adf6f 100644
--- a/lib/core/exception.py
+++ b/lib/core/exception.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/log.py b/lib/core/log.py
index 76502f104..096fdfd90 100644
--- a/lib/core/log.py
+++ b/lib/core/log.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/option.py b/lib/core/option.py
index 6fcb3536b..a0f8d4350 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index 72e3c1a4a..8a93de733 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/patch.py b/lib/core/patch.py
index e32d8b2cf..90a0ccecd 100644
--- a/lib/core/patch.py
+++ b/lib/core/patch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/profiling.py b/lib/core/profiling.py
index 72770263e..9ba1dd4c7 100644
--- a/lib/core/profiling.py
+++ b/lib/core/profiling.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/readlineng.py b/lib/core/readlineng.py
index 0726e5f15..90bf42741 100644
--- a/lib/core/readlineng.py
+++ b/lib/core/readlineng.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/replication.py b/lib/core/replication.py
index 5ae390668..01f2495a6 100644
--- a/lib/core/replication.py
+++ b/lib/core/replication.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/revision.py b/lib/core/revision.py
index 5255cb1b6..277d1f5f6 100644
--- a/lib/core/revision.py
+++ b/lib/core/revision.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/session.py b/lib/core/session.py
index 3b79d6e54..9cf569b68 100644
--- a/lib/core/session.py
+++ b/lib/core/session.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 6c27234b0..03077b89f 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
@@ -18,7 +18,7 @@ from lib.core.enums import OS
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.5.50"
+VERSION = "1.3.5.51"
 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/shell.py b/lib/core/shell.py
index 1b254bc19..3f18488a3 100644
--- a/lib/core/shell.py
+++ b/lib/core/shell.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/subprocessng.py b/lib/core/subprocessng.py
index 3bd103055..b33218210 100644
--- a/lib/core/subprocessng.py
+++ b/lib/core/subprocessng.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/target.py b/lib/core/target.py
index 6e6f4030b..9d4d9f28b 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/testing.py b/lib/core/testing.py
index 33c50846f..1f257b0b5 100644
--- a/lib/core/testing.py
+++ b/lib/core/testing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/threads.py b/lib/core/threads.py
index 8ed600dcb..2ec207ece 100644
--- a/lib/core/threads.py
+++ b/lib/core/threads.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/unescaper.py b/lib/core/unescaper.py
index 4678e60ad..e95378b15 100644
--- a/lib/core/unescaper.py
+++ b/lib/core/unescaper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/update.py b/lib/core/update.py
index 9b2677316..39b221e14 100644
--- a/lib/core/update.py
+++ b/lib/core/update.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/core/wordlist.py b/lib/core/wordlist.py
index a99e3df9c..fef136563 100644
--- a/lib/core/wordlist.py
+++ b/lib/core/wordlist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/parse/__init__.py b/lib/parse/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/parse/__init__.py
+++ b/lib/parse/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/parse/banner.py b/lib/parse/banner.py
index 8bc9f9ee0..77ae798f6 100644
--- a/lib/parse/banner.py
+++ b/lib/parse/banner.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 725e3d84c..c95c50f0f 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/parse/configfile.py b/lib/parse/configfile.py
index 36f063abc..22aa3e2a2 100644
--- a/lib/parse/configfile.py
+++ b/lib/parse/configfile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/parse/handler.py b/lib/parse/handler.py
index df63cecdb..ed03812bb 100644
--- a/lib/parse/handler.py
+++ b/lib/parse/handler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/parse/headers.py b/lib/parse/headers.py
index b16dea2ae..9676f91b1 100644
--- a/lib/parse/headers.py
+++ b/lib/parse/headers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/parse/html.py b/lib/parse/html.py
index 98cefae69..3ec61d52f 100644
--- a/lib/parse/html.py
+++ b/lib/parse/html.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/parse/payloads.py b/lib/parse/payloads.py
index 5765df92b..6ee738f16 100644
--- a/lib/parse/payloads.py
+++ b/lib/parse/payloads.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/parse/sitemap.py b/lib/parse/sitemap.py
index b369ab17a..83461c1b9 100644
--- a/lib/parse/sitemap.py
+++ b/lib/parse/sitemap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/__init__.py b/lib/request/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/request/__init__.py
+++ b/lib/request/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/basic.py b/lib/request/basic.py
index 7f4eb6724..c1b295250 100644
--- a/lib/request/basic.py
+++ b/lib/request/basic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/basicauthhandler.py b/lib/request/basicauthhandler.py
index a83e13478..b24bfaa2b 100644
--- a/lib/request/basicauthhandler.py
+++ b/lib/request/basicauthhandler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/chunkedhandler.py b/lib/request/chunkedhandler.py
index 740b5c846..96c5e8c23 100644
--- a/lib/request/chunkedhandler.py
+++ b/lib/request/chunkedhandler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/comparison.py b/lib/request/comparison.py
index 05eb7bedf..6d0de9eba 100644
--- a/lib/request/comparison.py
+++ b/lib/request/comparison.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/connect.py b/lib/request/connect.py
index 9979f31ab..082aee646 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/direct.py b/lib/request/direct.py
index 1bd675b1b..5326d27e9 100644
--- a/lib/request/direct.py
+++ b/lib/request/direct.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/dns.py b/lib/request/dns.py
index 42004cc9d..b6d8fb257 100644
--- a/lib/request/dns.py
+++ b/lib/request/dns.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/httpshandler.py b/lib/request/httpshandler.py
index 9cc2d6aa5..375cf61f5 100644
--- a/lib/request/httpshandler.py
+++ b/lib/request/httpshandler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/inject.py b/lib/request/inject.py
index 0715f54ee..3c52bd6b7 100644
--- a/lib/request/inject.py
+++ b/lib/request/inject.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/methodrequest.py b/lib/request/methodrequest.py
index 8fd679a34..ff8b35353 100644
--- a/lib/request/methodrequest.py
+++ b/lib/request/methodrequest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/pkihandler.py b/lib/request/pkihandler.py
index fe75e91a2..d6d42c823 100644
--- a/lib/request/pkihandler.py
+++ b/lib/request/pkihandler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/rangehandler.py b/lib/request/rangehandler.py
index 70cbc0164..f957bd81f 100644
--- a/lib/request/rangehandler.py
+++ b/lib/request/rangehandler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/redirecthandler.py b/lib/request/redirecthandler.py
index 9bf228ac6..961db87ad 100644
--- a/lib/request/redirecthandler.py
+++ b/lib/request/redirecthandler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/request/templates.py b/lib/request/templates.py
index 23138cf7e..6f8f155e0 100644
--- a/lib/request/templates.py
+++ b/lib/request/templates.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/takeover/__init__.py b/lib/takeover/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/takeover/__init__.py
+++ b/lib/takeover/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/takeover/abstraction.py b/lib/takeover/abstraction.py
index 1a7895806..a00bc2865 100644
--- a/lib/takeover/abstraction.py
+++ b/lib/takeover/abstraction.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/takeover/icmpsh.py b/lib/takeover/icmpsh.py
index 2fcfc0ae0..4be69f468 100644
--- a/lib/takeover/icmpsh.py
+++ b/lib/takeover/icmpsh.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
index 02fe1d793..9d4f29c54 100644
--- a/lib/takeover/metasploit.py
+++ b/lib/takeover/metasploit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/takeover/registry.py b/lib/takeover/registry.py
index 9314f266f..5b83526c0 100644
--- a/lib/takeover/registry.py
+++ b/lib/takeover/registry.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/takeover/udf.py b/lib/takeover/udf.py
index 45ecefc49..e5025d73d 100644
--- a/lib/takeover/udf.py
+++ b/lib/takeover/udf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/takeover/web.py b/lib/takeover/web.py
index 3e7680cbd..fb76432e8 100644
--- a/lib/takeover/web.py
+++ b/lib/takeover/web.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/takeover/xp_cmdshell.py b/lib/takeover/xp_cmdshell.py
index dc2e8eaf2..519be56e2 100644
--- a/lib/takeover/xp_cmdshell.py
+++ b/lib/takeover/xp_cmdshell.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/__init__.py b/lib/techniques/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/techniques/__init__.py
+++ b/lib/techniques/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/blind/__init__.py b/lib/techniques/blind/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/techniques/blind/__init__.py
+++ b/lib/techniques/blind/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
index 34415fa6b..47f5587fd 100644
--- a/lib/techniques/blind/inference.py
+++ b/lib/techniques/blind/inference.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/dns/__init__.py b/lib/techniques/dns/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/techniques/dns/__init__.py
+++ b/lib/techniques/dns/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/dns/test.py b/lib/techniques/dns/test.py
index 3c9d4b3a3..361a3b088 100644
--- a/lib/techniques/dns/test.py
+++ b/lib/techniques/dns/test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/dns/use.py b/lib/techniques/dns/use.py
index 0f17f463a..1e9bde529 100644
--- a/lib/techniques/dns/use.py
+++ b/lib/techniques/dns/use.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/error/__init__.py b/lib/techniques/error/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/techniques/error/__init__.py
+++ b/lib/techniques/error/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
index 45aac9163..a4ed17520 100644
--- a/lib/techniques/error/use.py
+++ b/lib/techniques/error/use.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/union/__init__.py b/lib/techniques/union/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/techniques/union/__init__.py
+++ b/lib/techniques/union/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/union/test.py b/lib/techniques/union/test.py
index ac91c568b..53f72d01a 100644
--- a/lib/techniques/union/test.py
+++ b/lib/techniques/union/test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py
index a1cf2f6a9..f7fa70206 100644
--- a/lib/techniques/union/use.py
+++ b/lib/techniques/union/use.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/__init__.py b/lib/utils/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/lib/utils/__init__.py
+++ b/lib/utils/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/api.py b/lib/utils/api.py
index 41c38907e..eabdcec33 100644
--- a/lib/utils/api.py
+++ b/lib/utils/api.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """
diff --git a/lib/utils/brute.py b/lib/utils/brute.py
index 84a79f657..ff4e7c17b 100644
--- a/lib/utils/brute.py
+++ b/lib/utils/brute.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/crawler.py b/lib/utils/crawler.py
index 898bbbcf6..66818592d 100644
--- a/lib/utils/crawler.py
+++ b/lib/utils/crawler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/deps.py b/lib/utils/deps.py
index 15c9a9e5d..265c0eb87 100644
--- a/lib/utils/deps.py
+++ b/lib/utils/deps.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/getch.py b/lib/utils/getch.py
index 4b4dcf9b0..733fdf570 100644
--- a/lib/utils/getch.py
+++ b/lib/utils/getch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/har.py b/lib/utils/har.py
index 5fa07632d..3d727b71b 100644
--- a/lib/utils/har.py
+++ b/lib/utils/har.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/hash.py b/lib/utils/hash.py
index c03c81702..7767bdca8 100644
--- a/lib/utils/hash.py
+++ b/lib/utils/hash.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/hashdb.py b/lib/utils/hashdb.py
index f756f1438..90e2a718f 100644
--- a/lib/utils/hashdb.py
+++ b/lib/utils/hashdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/htmlentities.py b/lib/utils/htmlentities.py
index e378e9418..a97320ec0 100644
--- a/lib/utils/htmlentities.py
+++ b/lib/utils/htmlentities.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/pivotdumptable.py b/lib/utils/pivotdumptable.py
index 64a3e4321..f0fb58a38 100644
--- a/lib/utils/pivotdumptable.py
+++ b/lib/utils/pivotdumptable.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/progress.py b/lib/utils/progress.py
index c41c61022..d33c71448 100644
--- a/lib/utils/progress.py
+++ b/lib/utils/progress.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/purge.py b/lib/utils/purge.py
index 3e22b2bb4..2e1e521bd 100644
--- a/lib/utils/purge.py
+++ b/lib/utils/purge.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/search.py b/lib/utils/search.py
index d907b2c51..3a20be03a 100644
--- a/lib/utils/search.py
+++ b/lib/utils/search.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/sqlalchemy.py b/lib/utils/sqlalchemy.py
index 71cec4dad..484b421ae 100644
--- a/lib/utils/sqlalchemy.py
+++ b/lib/utils/sqlalchemy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/timeout.py b/lib/utils/timeout.py
index 02a2f20ec..4f661769f 100644
--- a/lib/utils/timeout.py
+++ b/lib/utils/timeout.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/lib/utils/versioncheck.py b/lib/utils/versioncheck.py
index 8fbac1ea9..a1eea5d07 100644
--- a/lib/utils/versioncheck.py
+++ b/lib/utils/versioncheck.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/__init__.py b/plugins/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/plugins/__init__.py
+++ b/plugins/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/__init__.py b/plugins/dbms/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/plugins/dbms/__init__.py
+++ b/plugins/dbms/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/access/__init__.py b/plugins/dbms/access/__init__.py
index 60132fa9f..f204b0a09 100644
--- a/plugins/dbms/access/__init__.py
+++ b/plugins/dbms/access/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/access/connector.py b/plugins/dbms/access/connector.py
index 729d0f145..1bf363aa4 100644
--- a/plugins/dbms/access/connector.py
+++ b/plugins/dbms/access/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/access/enumeration.py b/plugins/dbms/access/enumeration.py
index b2fd4ab03..3028f9366 100644
--- a/plugins/dbms/access/enumeration.py
+++ b/plugins/dbms/access/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/access/filesystem.py b/plugins/dbms/access/filesystem.py
index 3b7cc137b..0d5009684 100644
--- a/plugins/dbms/access/filesystem.py
+++ b/plugins/dbms/access/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/access/fingerprint.py b/plugins/dbms/access/fingerprint.py
index a8544ecdf..339edba51 100644
--- a/plugins/dbms/access/fingerprint.py
+++ b/plugins/dbms/access/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/access/syntax.py b/plugins/dbms/access/syntax.py
index f792f2a57..fb64ecc3a 100644
--- a/plugins/dbms/access/syntax.py
+++ b/plugins/dbms/access/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/access/takeover.py b/plugins/dbms/access/takeover.py
index 4932b8b34..a7e67b73a 100644
--- a/plugins/dbms/access/takeover.py
+++ b/plugins/dbms/access/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/db2/__init__.py b/plugins/dbms/db2/__init__.py
index 2bef4b833..e37cc3913 100644
--- a/plugins/dbms/db2/__init__.py
+++ b/plugins/dbms/db2/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/db2/connector.py b/plugins/dbms/db2/connector.py
index 8e36e5b46..ab162ff55 100644
--- a/plugins/dbms/db2/connector.py
+++ b/plugins/dbms/db2/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/db2/enumeration.py b/plugins/dbms/db2/enumeration.py
index f83fa056b..3fbfa1ae0 100644
--- a/plugins/dbms/db2/enumeration.py
+++ b/plugins/dbms/db2/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/db2/filesystem.py b/plugins/dbms/db2/filesystem.py
index c640bae43..76c3c44e7 100644
--- a/plugins/dbms/db2/filesystem.py
+++ b/plugins/dbms/db2/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/db2/fingerprint.py b/plugins/dbms/db2/fingerprint.py
index 1a9ae8f90..d28622319 100644
--- a/plugins/dbms/db2/fingerprint.py
+++ b/plugins/dbms/db2/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/db2/syntax.py b/plugins/dbms/db2/syntax.py
index cdc83fa7d..669d5ca85 100644
--- a/plugins/dbms/db2/syntax.py
+++ b/plugins/dbms/db2/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/db2/takeover.py b/plugins/dbms/db2/takeover.py
index ea1682c1f..ca204b034 100644
--- a/plugins/dbms/db2/takeover.py
+++ b/plugins/dbms/db2/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/firebird/__init__.py b/plugins/dbms/firebird/__init__.py
index 16c426b86..85b46a55d 100644
--- a/plugins/dbms/firebird/__init__.py
+++ b/plugins/dbms/firebird/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/firebird/connector.py b/plugins/dbms/firebird/connector.py
index 93d824a01..10305f68e 100644
--- a/plugins/dbms/firebird/connector.py
+++ b/plugins/dbms/firebird/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/firebird/enumeration.py b/plugins/dbms/firebird/enumeration.py
index 0977d147b..29f1a3852 100644
--- a/plugins/dbms/firebird/enumeration.py
+++ b/plugins/dbms/firebird/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/firebird/filesystem.py b/plugins/dbms/firebird/filesystem.py
index 7d89005c0..21cec6896 100644
--- a/plugins/dbms/firebird/filesystem.py
+++ b/plugins/dbms/firebird/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/firebird/fingerprint.py b/plugins/dbms/firebird/fingerprint.py
index 90be5227a..96e287c2a 100644
--- a/plugins/dbms/firebird/fingerprint.py
+++ b/plugins/dbms/firebird/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/firebird/syntax.py b/plugins/dbms/firebird/syntax.py
index 95029ed32..281fb6fad 100644
--- a/plugins/dbms/firebird/syntax.py
+++ b/plugins/dbms/firebird/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/firebird/takeover.py b/plugins/dbms/firebird/takeover.py
index 850fbf966..2adb716b5 100644
--- a/plugins/dbms/firebird/takeover.py
+++ b/plugins/dbms/firebird/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/h2/__init__.py b/plugins/dbms/h2/__init__.py
index 0265363fe..334b53df6 100644
--- a/plugins/dbms/h2/__init__.py
+++ b/plugins/dbms/h2/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/h2/connector.py b/plugins/dbms/h2/connector.py
index 8785e4ad8..630d4e2e6 100644
--- a/plugins/dbms/h2/connector.py
+++ b/plugins/dbms/h2/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/h2/enumeration.py b/plugins/dbms/h2/enumeration.py
index 4e81b598b..abe022463 100644
--- a/plugins/dbms/h2/enumeration.py
+++ b/plugins/dbms/h2/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/h2/filesystem.py b/plugins/dbms/h2/filesystem.py
index 7090e7d18..800d206c8 100644
--- a/plugins/dbms/h2/filesystem.py
+++ b/plugins/dbms/h2/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/h2/fingerprint.py b/plugins/dbms/h2/fingerprint.py
index 8be42e66a..6b6353ecc 100644
--- a/plugins/dbms/h2/fingerprint.py
+++ b/plugins/dbms/h2/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/h2/syntax.py b/plugins/dbms/h2/syntax.py
index b6ce1cd27..be1bb443d 100644
--- a/plugins/dbms/h2/syntax.py
+++ b/plugins/dbms/h2/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/h2/takeover.py b/plugins/dbms/h2/takeover.py
index f93d2c1ef..075123723 100644
--- a/plugins/dbms/h2/takeover.py
+++ b/plugins/dbms/h2/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/hsqldb/__init__.py b/plugins/dbms/hsqldb/__init__.py
index 8f85bb6fb..166c121da 100644
--- a/plugins/dbms/hsqldb/__init__.py
+++ b/plugins/dbms/hsqldb/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/hsqldb/connector.py b/plugins/dbms/hsqldb/connector.py
index b57f92c11..2f8ae08aa 100644
--- a/plugins/dbms/hsqldb/connector.py
+++ b/plugins/dbms/hsqldb/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/hsqldb/enumeration.py b/plugins/dbms/hsqldb/enumeration.py
index c9bc656ff..7c415cb66 100644
--- a/plugins/dbms/hsqldb/enumeration.py
+++ b/plugins/dbms/hsqldb/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/hsqldb/filesystem.py b/plugins/dbms/hsqldb/filesystem.py
index 3c473e862..c0bb39b0c 100644
--- a/plugins/dbms/hsqldb/filesystem.py
+++ b/plugins/dbms/hsqldb/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/hsqldb/fingerprint.py b/plugins/dbms/hsqldb/fingerprint.py
index 2939460d2..4b1245b40 100644
--- a/plugins/dbms/hsqldb/fingerprint.py
+++ b/plugins/dbms/hsqldb/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/hsqldb/syntax.py b/plugins/dbms/hsqldb/syntax.py
index b6ce1cd27..be1bb443d 100644
--- a/plugins/dbms/hsqldb/syntax.py
+++ b/plugins/dbms/hsqldb/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/hsqldb/takeover.py b/plugins/dbms/hsqldb/takeover.py
index ce6cdb2d8..5c7d2199d 100644
--- a/plugins/dbms/hsqldb/takeover.py
+++ b/plugins/dbms/hsqldb/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/informix/__init__.py b/plugins/dbms/informix/__init__.py
index 44cd035db..50e2adee4 100644
--- a/plugins/dbms/informix/__init__.py
+++ b/plugins/dbms/informix/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/informix/connector.py b/plugins/dbms/informix/connector.py
index 346719dcd..133dc21ba 100644
--- a/plugins/dbms/informix/connector.py
+++ b/plugins/dbms/informix/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/informix/enumeration.py b/plugins/dbms/informix/enumeration.py
index eeb095f57..092224c94 100644
--- a/plugins/dbms/informix/enumeration.py
+++ b/plugins/dbms/informix/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/informix/filesystem.py b/plugins/dbms/informix/filesystem.py
index c640bae43..76c3c44e7 100644
--- a/plugins/dbms/informix/filesystem.py
+++ b/plugins/dbms/informix/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/informix/fingerprint.py b/plugins/dbms/informix/fingerprint.py
index db96512c1..a582a93d6 100644
--- a/plugins/dbms/informix/fingerprint.py
+++ b/plugins/dbms/informix/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/informix/syntax.py b/plugins/dbms/informix/syntax.py
index 692c7687d..b6a39f605 100644
--- a/plugins/dbms/informix/syntax.py
+++ b/plugins/dbms/informix/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/informix/takeover.py b/plugins/dbms/informix/takeover.py
index ea1682c1f..ca204b034 100644
--- a/plugins/dbms/informix/takeover.py
+++ b/plugins/dbms/informix/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/maxdb/__init__.py b/plugins/dbms/maxdb/__init__.py
index 550adc5dc..6bd694025 100644
--- a/plugins/dbms/maxdb/__init__.py
+++ b/plugins/dbms/maxdb/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/maxdb/connector.py b/plugins/dbms/maxdb/connector.py
index 2f9a46a24..8b06d639e 100644
--- a/plugins/dbms/maxdb/connector.py
+++ b/plugins/dbms/maxdb/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/maxdb/enumeration.py b/plugins/dbms/maxdb/enumeration.py
index 78e5b2671..a57bb26e2 100644
--- a/plugins/dbms/maxdb/enumeration.py
+++ b/plugins/dbms/maxdb/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/maxdb/filesystem.py b/plugins/dbms/maxdb/filesystem.py
index ff23fab30..34da2b769 100644
--- a/plugins/dbms/maxdb/filesystem.py
+++ b/plugins/dbms/maxdb/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/maxdb/fingerprint.py b/plugins/dbms/maxdb/fingerprint.py
index bb56f4bcb..575091a77 100644
--- a/plugins/dbms/maxdb/fingerprint.py
+++ b/plugins/dbms/maxdb/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/maxdb/syntax.py b/plugins/dbms/maxdb/syntax.py
index b8c8447f6..1f2730966 100644
--- a/plugins/dbms/maxdb/syntax.py
+++ b/plugins/dbms/maxdb/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/maxdb/takeover.py b/plugins/dbms/maxdb/takeover.py
index 8b1d5d72e..796443b21 100644
--- a/plugins/dbms/maxdb/takeover.py
+++ b/plugins/dbms/maxdb/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mssqlserver/__init__.py b/plugins/dbms/mssqlserver/__init__.py
index 7d6220fde..40696af8c 100644
--- a/plugins/dbms/mssqlserver/__init__.py
+++ b/plugins/dbms/mssqlserver/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mssqlserver/connector.py b/plugins/dbms/mssqlserver/connector.py
index 301a826a9..49ab6fc1f 100644
--- a/plugins/dbms/mssqlserver/connector.py
+++ b/plugins/dbms/mssqlserver/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mssqlserver/enumeration.py b/plugins/dbms/mssqlserver/enumeration.py
index 83703a54e..8f606ee2f 100644
--- a/plugins/dbms/mssqlserver/enumeration.py
+++ b/plugins/dbms/mssqlserver/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mssqlserver/filesystem.py b/plugins/dbms/mssqlserver/filesystem.py
index ebb8897cd..66d146e2d 100644
--- a/plugins/dbms/mssqlserver/filesystem.py
+++ b/plugins/dbms/mssqlserver/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mssqlserver/fingerprint.py b/plugins/dbms/mssqlserver/fingerprint.py
index 502839480..e95c074ca 100644
--- a/plugins/dbms/mssqlserver/fingerprint.py
+++ b/plugins/dbms/mssqlserver/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mssqlserver/syntax.py b/plugins/dbms/mssqlserver/syntax.py
index 5f6eb0c79..5d4082e0c 100644
--- a/plugins/dbms/mssqlserver/syntax.py
+++ b/plugins/dbms/mssqlserver/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mssqlserver/takeover.py b/plugins/dbms/mssqlserver/takeover.py
index 3903a44fa..0e35ae7aa 100644
--- a/plugins/dbms/mssqlserver/takeover.py
+++ b/plugins/dbms/mssqlserver/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mysql/__init__.py b/plugins/dbms/mysql/__init__.py
index a231ac8cb..3c171b692 100644
--- a/plugins/dbms/mysql/__init__.py
+++ b/plugins/dbms/mysql/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mysql/connector.py b/plugins/dbms/mysql/connector.py
index f68e7b004..6e1fc60de 100644
--- a/plugins/dbms/mysql/connector.py
+++ b/plugins/dbms/mysql/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mysql/enumeration.py b/plugins/dbms/mysql/enumeration.py
index e0d798ddf..ccb7e534e 100644
--- a/plugins/dbms/mysql/enumeration.py
+++ b/plugins/dbms/mysql/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mysql/filesystem.py b/plugins/dbms/mysql/filesystem.py
index 9063a4708..c79f2ccc2 100644
--- a/plugins/dbms/mysql/filesystem.py
+++ b/plugins/dbms/mysql/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mysql/fingerprint.py b/plugins/dbms/mysql/fingerprint.py
index 20970e6d9..6ad8f53a6 100644
--- a/plugins/dbms/mysql/fingerprint.py
+++ b/plugins/dbms/mysql/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mysql/syntax.py b/plugins/dbms/mysql/syntax.py
index a1f4f670a..542e094ef 100644
--- a/plugins/dbms/mysql/syntax.py
+++ b/plugins/dbms/mysql/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/mysql/takeover.py b/plugins/dbms/mysql/takeover.py
index e0b9a10ac..a66d12313 100644
--- a/plugins/dbms/mysql/takeover.py
+++ b/plugins/dbms/mysql/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/oracle/__init__.py b/plugins/dbms/oracle/__init__.py
index bdecccfcc..e2d352542 100644
--- a/plugins/dbms/oracle/__init__.py
+++ b/plugins/dbms/oracle/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/oracle/connector.py b/plugins/dbms/oracle/connector.py
index f9110311c..bb88f9cb9 100644
--- a/plugins/dbms/oracle/connector.py
+++ b/plugins/dbms/oracle/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/oracle/enumeration.py b/plugins/dbms/oracle/enumeration.py
index fe03da705..d31679bec 100644
--- a/plugins/dbms/oracle/enumeration.py
+++ b/plugins/dbms/oracle/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/oracle/filesystem.py b/plugins/dbms/oracle/filesystem.py
index d5f7a1634..00520c91e 100644
--- a/plugins/dbms/oracle/filesystem.py
+++ b/plugins/dbms/oracle/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/oracle/fingerprint.py b/plugins/dbms/oracle/fingerprint.py
index 0f6793d77..29d35296a 100644
--- a/plugins/dbms/oracle/fingerprint.py
+++ b/plugins/dbms/oracle/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/oracle/syntax.py b/plugins/dbms/oracle/syntax.py
index 5dff48410..60865c00c 100644
--- a/plugins/dbms/oracle/syntax.py
+++ b/plugins/dbms/oracle/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/oracle/takeover.py b/plugins/dbms/oracle/takeover.py
index 4eadef0af..dbffdb4fa 100644
--- a/plugins/dbms/oracle/takeover.py
+++ b/plugins/dbms/oracle/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/postgresql/__init__.py b/plugins/dbms/postgresql/__init__.py
index 73af3b9c8..7d46c6f1f 100644
--- a/plugins/dbms/postgresql/__init__.py
+++ b/plugins/dbms/postgresql/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/postgresql/connector.py b/plugins/dbms/postgresql/connector.py
index a7d4ec99d..1b81bc1f5 100644
--- a/plugins/dbms/postgresql/connector.py
+++ b/plugins/dbms/postgresql/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/postgresql/enumeration.py b/plugins/dbms/postgresql/enumeration.py
index 1db588aa1..b1097bcf0 100644
--- a/plugins/dbms/postgresql/enumeration.py
+++ b/plugins/dbms/postgresql/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/postgresql/filesystem.py b/plugins/dbms/postgresql/filesystem.py
index 935afb410..0a3b60086 100644
--- a/plugins/dbms/postgresql/filesystem.py
+++ b/plugins/dbms/postgresql/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/postgresql/fingerprint.py b/plugins/dbms/postgresql/fingerprint.py
index b6be3230e..e7deefb17 100644
--- a/plugins/dbms/postgresql/fingerprint.py
+++ b/plugins/dbms/postgresql/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/postgresql/syntax.py b/plugins/dbms/postgresql/syntax.py
index 4509abc8e..179c828de 100644
--- a/plugins/dbms/postgresql/syntax.py
+++ b/plugins/dbms/postgresql/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/postgresql/takeover.py b/plugins/dbms/postgresql/takeover.py
index adb73c5a1..f9ccb46b2 100644
--- a/plugins/dbms/postgresql/takeover.py
+++ b/plugins/dbms/postgresql/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sqlite/__init__.py b/plugins/dbms/sqlite/__init__.py
index 0c0440c08..004a7165d 100644
--- a/plugins/dbms/sqlite/__init__.py
+++ b/plugins/dbms/sqlite/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sqlite/connector.py b/plugins/dbms/sqlite/connector.py
index c244a86ad..d4a606a1c 100644
--- a/plugins/dbms/sqlite/connector.py
+++ b/plugins/dbms/sqlite/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sqlite/enumeration.py b/plugins/dbms/sqlite/enumeration.py
index b0b6efe80..c596318ba 100644
--- a/plugins/dbms/sqlite/enumeration.py
+++ b/plugins/dbms/sqlite/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sqlite/filesystem.py b/plugins/dbms/sqlite/filesystem.py
index c57720e9f..c12bc48b9 100644
--- a/plugins/dbms/sqlite/filesystem.py
+++ b/plugins/dbms/sqlite/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sqlite/fingerprint.py b/plugins/dbms/sqlite/fingerprint.py
index af44f5a12..9fc3dcc3e 100644
--- a/plugins/dbms/sqlite/fingerprint.py
+++ b/plugins/dbms/sqlite/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sqlite/syntax.py b/plugins/dbms/sqlite/syntax.py
index 874203fdb..b4b20e767 100644
--- a/plugins/dbms/sqlite/syntax.py
+++ b/plugins/dbms/sqlite/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sqlite/takeover.py b/plugins/dbms/sqlite/takeover.py
index 129866cd0..0f1f5dab1 100644
--- a/plugins/dbms/sqlite/takeover.py
+++ b/plugins/dbms/sqlite/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sybase/__init__.py b/plugins/dbms/sybase/__init__.py
index 60d190351..9eedd7e01 100644
--- a/plugins/dbms/sybase/__init__.py
+++ b/plugins/dbms/sybase/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sybase/connector.py b/plugins/dbms/sybase/connector.py
index e11a7649b..4c1acfe07 100644
--- a/plugins/dbms/sybase/connector.py
+++ b/plugins/dbms/sybase/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sybase/enumeration.py b/plugins/dbms/sybase/enumeration.py
index 6b6c42313..475ae54af 100644
--- a/plugins/dbms/sybase/enumeration.py
+++ b/plugins/dbms/sybase/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sybase/filesystem.py b/plugins/dbms/sybase/filesystem.py
index 0032f8c5c..30b3f6b4a 100644
--- a/plugins/dbms/sybase/filesystem.py
+++ b/plugins/dbms/sybase/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sybase/fingerprint.py b/plugins/dbms/sybase/fingerprint.py
index 0c62f848f..ca0f11370 100644
--- a/plugins/dbms/sybase/fingerprint.py
+++ b/plugins/dbms/sybase/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sybase/syntax.py b/plugins/dbms/sybase/syntax.py
index aaf515aac..75799dc83 100644
--- a/plugins/dbms/sybase/syntax.py
+++ b/plugins/dbms/sybase/syntax.py
@@ -1,4 +1,4 @@
-1#!/usr/bin/env python2
+1#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/dbms/sybase/takeover.py b/plugins/dbms/sybase/takeover.py
index 0d2bf0891..98681a78b 100644
--- a/plugins/dbms/sybase/takeover.py
+++ b/plugins/dbms/sybase/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/__init__.py b/plugins/generic/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/plugins/generic/__init__.py
+++ b/plugins/generic/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/connector.py b/plugins/generic/connector.py
index ca52a3be0..76188988f 100644
--- a/plugins/generic/connector.py
+++ b/plugins/generic/connector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/custom.py b/plugins/generic/custom.py
index d7a025210..b902bd115 100644
--- a/plugins/generic/custom.py
+++ b/plugins/generic/custom.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/databases.py b/plugins/generic/databases.py
index 64f64e66f..add047ed7 100644
--- a/plugins/generic/databases.py
+++ b/plugins/generic/databases.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/entries.py b/plugins/generic/entries.py
index dcb89431d..7f3c21542 100644
--- a/plugins/generic/entries.py
+++ b/plugins/generic/entries.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 7fa99772f..c8b40728e 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/filesystem.py b/plugins/generic/filesystem.py
index fb816c5b5..bb417be1a 100644
--- a/plugins/generic/filesystem.py
+++ b/plugins/generic/filesystem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/fingerprint.py b/plugins/generic/fingerprint.py
index 63aa14da5..b593e629c 100644
--- a/plugins/generic/fingerprint.py
+++ b/plugins/generic/fingerprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/misc.py b/plugins/generic/misc.py
index 388149b37..cfced34e2 100644
--- a/plugins/generic/misc.py
+++ b/plugins/generic/misc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/search.py b/plugins/generic/search.py
index 088019786..b8cda1410 100644
--- a/plugins/generic/search.py
+++ b/plugins/generic/search.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/syntax.py b/plugins/generic/syntax.py
index f0c86d3a1..9ef65a54b 100644
--- a/plugins/generic/syntax.py
+++ b/plugins/generic/syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/takeover.py b/plugins/generic/takeover.py
index fee1228ab..6a235efb6 100644
--- a/plugins/generic/takeover.py
+++ b/plugins/generic/takeover.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/plugins/generic/users.py b/plugins/generic/users.py
index 81e747934..e0c527df0 100644
--- a/plugins/generic/users.py
+++ b/plugins/generic/users.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/sqlmap.py b/sqlmap.py
index c1f827e57..9c3a073b3 100755
--- a/sqlmap.py
+++ b/sqlmap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/sqlmapapi.py b/sqlmapapi.py
index 2f9727b5d..e491417dd 100755
--- a/sqlmapapi.py
+++ b/sqlmapapi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/__init__.py b/tamper/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/tamper/__init__.py
+++ b/tamper/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/apostrophemask.py b/tamper/apostrophemask.py
index 889f59bd5..d5ed52de3 100644
--- a/tamper/apostrophemask.py
+++ b/tamper/apostrophemask.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/apostrophenullencode.py b/tamper/apostrophenullencode.py
index 761012282..751c0096b 100644
--- a/tamper/apostrophenullencode.py
+++ b/tamper/apostrophenullencode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/appendnullbyte.py b/tamper/appendnullbyte.py
index 3b2e0cddb..5d23e4d57 100644
--- a/tamper/appendnullbyte.py
+++ b/tamper/appendnullbyte.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/base64encode.py b/tamper/base64encode.py
index 6a6cccc31..9718da1e0 100644
--- a/tamper/base64encode.py
+++ b/tamper/base64encode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/between.py b/tamper/between.py
index 5c8392990..e8d46b8f4 100644
--- a/tamper/between.py
+++ b/tamper/between.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/bluecoat.py b/tamper/bluecoat.py
index 67dd9b716..4b88a3985 100644
--- a/tamper/bluecoat.py
+++ b/tamper/bluecoat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/chardoubleencode.py b/tamper/chardoubleencode.py
index dd638487d..512c2b3b4 100644
--- a/tamper/chardoubleencode.py
+++ b/tamper/chardoubleencode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/charencode.py b/tamper/charencode.py
index d1d5d4d47..bf2283b1f 100644
--- a/tamper/charencode.py
+++ b/tamper/charencode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/charunicodeencode.py b/tamper/charunicodeencode.py
index 5999d73eb..8bd456fab 100644
--- a/tamper/charunicodeencode.py
+++ b/tamper/charunicodeencode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/charunicodeescape.py b/tamper/charunicodeescape.py
index 9e23887a6..790d8d6c4 100644
--- a/tamper/charunicodeescape.py
+++ b/tamper/charunicodeescape.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/commalesslimit.py b/tamper/commalesslimit.py
index b3a561e70..7ebecbcec 100644
--- a/tamper/commalesslimit.py
+++ b/tamper/commalesslimit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/commalessmid.py b/tamper/commalessmid.py
index ffe9486f1..379586829 100644
--- a/tamper/commalessmid.py
+++ b/tamper/commalessmid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/commentbeforeparentheses.py b/tamper/commentbeforeparentheses.py
index 4d394f58e..23933c279 100644
--- a/tamper/commentbeforeparentheses.py
+++ b/tamper/commentbeforeparentheses.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/concat2concatws.py b/tamper/concat2concatws.py
index 93679912a..d2663bb2f 100644
--- a/tamper/concat2concatws.py
+++ b/tamper/concat2concatws.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/equaltolike.py b/tamper/equaltolike.py
index 6aa8aae3b..bc65eff13 100644
--- a/tamper/equaltolike.py
+++ b/tamper/equaltolike.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/escapequotes.py b/tamper/escapequotes.py
index 3c75cf0fb..db7c4c388 100644
--- a/tamper/escapequotes.py
+++ b/tamper/escapequotes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/greatest.py b/tamper/greatest.py
index 9a6a49c8d..989280cc8 100644
--- a/tamper/greatest.py
+++ b/tamper/greatest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/halfversionedmorekeywords.py b/tamper/halfversionedmorekeywords.py
index 36bbed7f1..7a40f9f4c 100644
--- a/tamper/halfversionedmorekeywords.py
+++ b/tamper/halfversionedmorekeywords.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/hex2char.py b/tamper/hex2char.py
index 9b843b861..71d1f1ed4 100644
--- a/tamper/hex2char.py
+++ b/tamper/hex2char.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/htmlencode.py b/tamper/htmlencode.py
index 491c67322..8eed7b406 100644
--- a/tamper/htmlencode.py
+++ b/tamper/htmlencode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/ifnull2casewhenisnull.py b/tamper/ifnull2casewhenisnull.py
index 3a222cbda..b7680ff13 100644
--- a/tamper/ifnull2casewhenisnull.py
+++ b/tamper/ifnull2casewhenisnull.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/ifnull2ifisnull.py b/tamper/ifnull2ifisnull.py
index eb8f61189..c933751ce 100644
--- a/tamper/ifnull2ifisnull.py
+++ b/tamper/ifnull2ifisnull.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/informationschemacomment.py b/tamper/informationschemacomment.py
index b6f472e68..7076fecaa 100644
--- a/tamper/informationschemacomment.py
+++ b/tamper/informationschemacomment.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/least.py b/tamper/least.py
index 5a0e96ee2..53a8a6aad 100644
--- a/tamper/least.py
+++ b/tamper/least.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/lowercase.py b/tamper/lowercase.py
index 4aff78cf7..101e4436a 100644
--- a/tamper/lowercase.py
+++ b/tamper/lowercase.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/luanginx.py b/tamper/luanginx.py
index 91d5c4fc3..e8ad3db28 100644
--- a/tamper/luanginx.py
+++ b/tamper/luanginx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/modsecurityversioned.py b/tamper/modsecurityversioned.py
index 6bd16a8f9..605c1aee2 100644
--- a/tamper/modsecurityversioned.py
+++ b/tamper/modsecurityversioned.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/modsecurityzeroversioned.py b/tamper/modsecurityzeroversioned.py
index 7ded8627b..af358f58b 100644
--- a/tamper/modsecurityzeroversioned.py
+++ b/tamper/modsecurityzeroversioned.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/multiplespaces.py b/tamper/multiplespaces.py
index 0b3473f8e..96ccb1532 100644
--- a/tamper/multiplespaces.py
+++ b/tamper/multiplespaces.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/overlongutf8.py b/tamper/overlongutf8.py
index 7d60682b8..5cc28a630 100644
--- a/tamper/overlongutf8.py
+++ b/tamper/overlongutf8.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/overlongutf8more.py b/tamper/overlongutf8more.py
index a6f658052..301945f4f 100644
--- a/tamper/overlongutf8more.py
+++ b/tamper/overlongutf8more.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/percentage.py b/tamper/percentage.py
index 57abb0f1c..71259fd88 100644
--- a/tamper/percentage.py
+++ b/tamper/percentage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/plus2concat.py b/tamper/plus2concat.py
index 776a7eec1..f4d7331ba 100644
--- a/tamper/plus2concat.py
+++ b/tamper/plus2concat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/plus2fnconcat.py b/tamper/plus2fnconcat.py
index 121549710..60bcc917c 100644
--- a/tamper/plus2fnconcat.py
+++ b/tamper/plus2fnconcat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/randomcase.py b/tamper/randomcase.py
index ed23c7e73..923e2a6b2 100644
--- a/tamper/randomcase.py
+++ b/tamper/randomcase.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/randomcomments.py b/tamper/randomcomments.py
index 9eacb2c94..678c36a92 100644
--- a/tamper/randomcomments.py
+++ b/tamper/randomcomments.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/sp_password.py b/tamper/sp_password.py
index 4fd8a6ce0..0f2f813a4 100644
--- a/tamper/sp_password.py
+++ b/tamper/sp_password.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2comment.py b/tamper/space2comment.py
index e62bde276..7db34f56e 100644
--- a/tamper/space2comment.py
+++ b/tamper/space2comment.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2dash.py b/tamper/space2dash.py
index 55fcc7b2a..445ade421 100644
--- a/tamper/space2dash.py
+++ b/tamper/space2dash.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2hash.py b/tamper/space2hash.py
index 5c8ca56d0..416133260 100644
--- a/tamper/space2hash.py
+++ b/tamper/space2hash.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2morecomment.py b/tamper/space2morecomment.py
index 39048cb0e..39499c117 100644
--- a/tamper/space2morecomment.py
+++ b/tamper/space2morecomment.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2morehash.py b/tamper/space2morehash.py
index 42f917d59..614a3c224 100644
--- a/tamper/space2morehash.py
+++ b/tamper/space2morehash.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2mssqlblank.py b/tamper/space2mssqlblank.py
index e900ddd27..0e4135daf 100644
--- a/tamper/space2mssqlblank.py
+++ b/tamper/space2mssqlblank.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2mssqlhash.py b/tamper/space2mssqlhash.py
index 12f793b55..f0d88fe01 100644
--- a/tamper/space2mssqlhash.py
+++ b/tamper/space2mssqlhash.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2mysqlblank.py b/tamper/space2mysqlblank.py
index 5a92569f0..7352d417a 100644
--- a/tamper/space2mysqlblank.py
+++ b/tamper/space2mysqlblank.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2mysqldash.py b/tamper/space2mysqldash.py
index 550ea9a40..917505a4a 100644
--- a/tamper/space2mysqldash.py
+++ b/tamper/space2mysqldash.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2plus.py b/tamper/space2plus.py
index 063b6ff23..8fc74c8b1 100644
--- a/tamper/space2plus.py
+++ b/tamper/space2plus.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/space2randomblank.py b/tamper/space2randomblank.py
index 009df0eb8..343afa8d9 100644
--- a/tamper/space2randomblank.py
+++ b/tamper/space2randomblank.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/substring2leftright.py b/tamper/substring2leftright.py
index 8e1ea8410..4ed890c0b 100644
--- a/tamper/substring2leftright.py
+++ b/tamper/substring2leftright.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/symboliclogical.py b/tamper/symboliclogical.py
index bbf55737b..88af8f9ad 100644
--- a/tamper/symboliclogical.py
+++ b/tamper/symboliclogical.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/unionalltounion.py b/tamper/unionalltounion.py
index f8d2e6eca..6d24acb06 100644
--- a/tamper/unionalltounion.py
+++ b/tamper/unionalltounion.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/unmagicquotes.py b/tamper/unmagicquotes.py
index 2f418ff6b..a89e0a75e 100644
--- a/tamper/unmagicquotes.py
+++ b/tamper/unmagicquotes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/uppercase.py b/tamper/uppercase.py
index 075a23d85..faec80704 100644
--- a/tamper/uppercase.py
+++ b/tamper/uppercase.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/varnish.py b/tamper/varnish.py
index 0eafb243c..d37f4ae2f 100644
--- a/tamper/varnish.py
+++ b/tamper/varnish.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/versionedkeywords.py b/tamper/versionedkeywords.py
index ca0f6fdc5..af27d4cbe 100644
--- a/tamper/versionedkeywords.py
+++ b/tamper/versionedkeywords.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/versionedmorekeywords.py b/tamper/versionedmorekeywords.py
index cf28e57ad..4f9263442 100644
--- a/tamper/versionedmorekeywords.py
+++ b/tamper/versionedmorekeywords.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/tamper/xforwardedfor.py b/tamper/xforwardedfor.py
index 7bcde6337..5801a1068 100644
--- a/tamper/xforwardedfor.py
+++ b/tamper/xforwardedfor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/thirdparty/bottle/bottle.py b/thirdparty/bottle/bottle.py
index 76c605ba8..a937493ba 100644
--- a/thirdparty/bottle/bottle.py
+++ b/thirdparty/bottle/bottle.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
 Bottle is a fast and simple micro-framework for small web applications. It
diff --git a/thirdparty/chardet/chardetect.py b/thirdparty/chardet/chardetect.py
index 1604c20d3..ffe892f25 100644
--- a/thirdparty/chardet/chardetect.py
+++ b/thirdparty/chardet/chardetect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 """
 Script which takes one or more file paths and reports on their detected
 encodings
diff --git a/thirdparty/fcrypt/__init__.py b/thirdparty/fcrypt/__init__.py
index d95a61132..31bb3a635 100644
--- a/thirdparty/fcrypt/__init__.py
+++ b/thirdparty/fcrypt/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 #Copyright (c) 2004, Carey Evans <careye@spamcop.net>
 #All rights reserved.
diff --git a/thirdparty/keepalive/__init__.py b/thirdparty/keepalive/__init__.py
index 538ea244c..08a0be4d9 100644
--- a/thirdparty/keepalive/__init__.py
+++ b/thirdparty/keepalive/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright 2002-2003 Michael D. Stenner
 #
diff --git a/thirdparty/keepalive/keepalive.py b/thirdparty/keepalive/keepalive.py
index 25eda69b1..86bcdd877 100644
--- a/thirdparty/keepalive/keepalive.py
+++ b/thirdparty/keepalive/keepalive.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 #   This library is free software; you can redistribute it and/or
diff --git a/thirdparty/multipart/multipartpost.py b/thirdparty/multipart/multipartpost.py
index 11d6ef95f..d458cfa60 100644
--- a/thirdparty/multipart/multipartpost.py
+++ b/thirdparty/multipart/multipartpost.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 02/2006 Will Holcomb <wholcomb@gmail.com>
diff --git a/thirdparty/odict/__init__.py b/thirdparty/odict/__init__.py
index c9dcf471e..8571776ae 100644
--- a/thirdparty/odict/__init__.py
+++ b/thirdparty/odict/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 import sys
 
diff --git a/thirdparty/prettyprint/__init__.py b/thirdparty/prettyprint/__init__.py
index 77745d480..1f9e14343 100644
--- a/thirdparty/prettyprint/__init__.py
+++ b/thirdparty/prettyprint/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 #Copyright (c) 2010, Chris Hall <chris.hall@mod10.net>
 #All rights reserved.
diff --git a/thirdparty/prettyprint/prettyprint.py b/thirdparty/prettyprint/prettyprint.py
index 041235948..586d80811 100644
--- a/thirdparty/prettyprint/prettyprint.py
+++ b/thirdparty/prettyprint/prettyprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 #Copyright (c) 2010, Chris Hall <chris.hall@mod10.net>
 #All rights reserved.
diff --git a/thirdparty/pydes/__init__.py b/thirdparty/pydes/__init__.py
index 3cd583548..b412cc831 100644
--- a/thirdparty/pydes/__init__.py
+++ b/thirdparty/pydes/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright 2009 Todd Whiteman
 #
diff --git a/thirdparty/socks/socks.py b/thirdparty/socks/socks.py
index 85a7ae90d..70dba70e4 100644
--- a/thirdparty/socks/socks.py
+++ b/thirdparty/socks/socks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """SocksiPy - Python SOCKS module.
 Version 1.00
diff --git a/thirdparty/wininetpton/__init__.py b/thirdparty/wininetpton/__init__.py
index cd479efd9..5ea298dc1 100644
--- a/thirdparty/wininetpton/__init__.py
+++ b/thirdparty/wininetpton/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright Ryan Vennell
 #
diff --git a/thirdparty/wininetpton/win_inet_pton.py b/thirdparty/wininetpton/win_inet_pton.py
index 1f2b69b02..50ae621e5 100644
--- a/thirdparty/wininetpton/win_inet_pton.py
+++ b/thirdparty/wininetpton/win_inet_pton.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # This software released into the public domain. Anyone is free to copy,
 # modify, publish, use, compile, sell, or distribute this software,
 # either in source code form or as a compiled binary, for any purpose,
diff --git a/waf/360.py b/waf/360.py
index 0953434aa..9342d3321 100644
--- a/waf/360.py
+++ b/waf/360.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/__init__.py b/waf/__init__.py
index 8307a1c28..c654cbef7 100644
--- a/waf/__init__.py
+++ b/waf/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/aesecure.py b/waf/aesecure.py
index 5b871463d..46bf75fb6 100644
--- a/waf/aesecure.py
+++ b/waf/aesecure.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/airlock.py b/waf/airlock.py
index 5a6990961..3ef082d82 100644
--- a/waf/airlock.py
+++ b/waf/airlock.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/anquanbao.py b/waf/anquanbao.py
index 33b2dcd5d..d2d86bd0c 100644
--- a/waf/anquanbao.py
+++ b/waf/anquanbao.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/approach.py b/waf/approach.py
index fe7103b85..b44eddbdc 100644
--- a/waf/approach.py
+++ b/waf/approach.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/armor.py b/waf/armor.py
index 6f20b7806..63c240135 100644
--- a/waf/armor.py
+++ b/waf/armor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/asm.py b/waf/asm.py
index dbd105b20..4e0837914 100644
--- a/waf/asm.py
+++ b/waf/asm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/astra.py b/waf/astra.py
index b979c7732..3160b5706 100644
--- a/waf/astra.py
+++ b/waf/astra.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/aws.py b/waf/aws.py
index cc2137dda..624db991a 100644
--- a/waf/aws.py
+++ b/waf/aws.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/barracuda.py b/waf/barracuda.py
index 8305d6eb3..d19ec04f9 100644
--- a/waf/barracuda.py
+++ b/waf/barracuda.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/bekchy.py b/waf/bekchy.py
index 0db7b2d27..ca4932ed0 100644
--- a/waf/bekchy.py
+++ b/waf/bekchy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/bitninja.py b/waf/bitninja.py
index fc82310a6..ee405b6ed 100644
--- a/waf/bitninja.py
+++ b/waf/bitninja.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/bluedon.py b/waf/bluedon.py
index 2ae369042..f4dbf7814 100644
--- a/waf/bluedon.py
+++ b/waf/bluedon.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/cerber.py b/waf/cerber.py
index 404b4eed4..1fda49d82 100644
--- a/waf/cerber.py
+++ b/waf/cerber.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/chinacache.py b/waf/chinacache.py
index 608a3eb1b..eaf4ccc10 100644
--- a/waf/chinacache.py
+++ b/waf/chinacache.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/ciscoacexml.py b/waf/ciscoacexml.py
index 7ab2d9b4b..156cadb28 100644
--- a/waf/ciscoacexml.py
+++ b/waf/ciscoacexml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/cloudbric.py b/waf/cloudbric.py
index 97a2e2db6..649c1e54b 100644
--- a/waf/cloudbric.py
+++ b/waf/cloudbric.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/cloudflare.py b/waf/cloudflare.py
index 1f63b7d79..1322882ea 100644
--- a/waf/cloudflare.py
+++ b/waf/cloudflare.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/cloudfront.py b/waf/cloudfront.py
index 8c1e22ceb..b18cade57 100644
--- a/waf/cloudfront.py
+++ b/waf/cloudfront.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/comodo.py b/waf/comodo.py
index 786db3059..c3cb35083 100644
--- a/waf/comodo.py
+++ b/waf/comodo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/crawlprotect.py b/waf/crawlprotect.py
index 3497066c0..c88e62527 100644
--- a/waf/crawlprotect.py
+++ b/waf/crawlprotect.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/distil.py b/waf/distil.py
index b2b6e2602..77a213eed 100644
--- a/waf/distil.py
+++ b/waf/distil.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/dotdefender.py b/waf/dotdefender.py
index a7b8ad555..57e9402d9 100644
--- a/waf/dotdefender.py
+++ b/waf/dotdefender.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/edgecast.py b/waf/edgecast.py
index ea3b4dd57..4a7ed503e 100644
--- a/waf/edgecast.py
+++ b/waf/edgecast.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/expressionengine.py b/waf/expressionengine.py
index 9b1589173..9879d34a8 100644
--- a/waf/expressionengine.py
+++ b/waf/expressionengine.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/fortiweb.py b/waf/fortiweb.py
index 0af1290f6..b5d2c1b75 100644
--- a/waf/fortiweb.py
+++ b/waf/fortiweb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/generic.py b/waf/generic.py
index ea4b6c3eb..a1d9e9e2d 100644
--- a/waf/generic.py
+++ b/waf/generic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/godaddy.py b/waf/godaddy.py
index 6ccef66b7..8989a77c4 100644
--- a/waf/godaddy.py
+++ b/waf/godaddy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/greywizard.py b/waf/greywizard.py
index b39b36288..73b60134d 100644
--- a/waf/greywizard.py
+++ b/waf/greywizard.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/imunify360.py b/waf/imunify360.py
index 9826ed919..1fdcd175c 100644
--- a/waf/imunify360.py
+++ b/waf/imunify360.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/incapsula.py b/waf/incapsula.py
index 97ba89e09..eff9954e3 100644
--- a/waf/incapsula.py
+++ b/waf/incapsula.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/isaserver.py b/waf/isaserver.py
index a5b875339..2f4f11137 100644
--- a/waf/isaserver.py
+++ b/waf/isaserver.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/janusec.py b/waf/janusec.py
index 05228895f..ac6850a26 100644
--- a/waf/janusec.py
+++ b/waf/janusec.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/jiasule.py b/waf/jiasule.py
index 9f592503b..9f3de7b59 100644
--- a/waf/jiasule.py
+++ b/waf/jiasule.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/knownsec.py b/waf/knownsec.py
index bb8116f24..13232c7b6 100644
--- a/waf/knownsec.py
+++ b/waf/knownsec.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/kona.py b/waf/kona.py
index 2ac797fb6..c34f2d973 100644
--- a/waf/kona.py
+++ b/waf/kona.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/malcare.py b/waf/malcare.py
index 4dad73739..85902f2fd 100644
--- a/waf/malcare.py
+++ b/waf/malcare.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/modsecurity.py b/waf/modsecurity.py
index 9c619c0b9..74f651498 100644
--- a/waf/modsecurity.py
+++ b/waf/modsecurity.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/naxsi.py b/waf/naxsi.py
index 5423b0b6f..67638bc27 100644
--- a/waf/naxsi.py
+++ b/waf/naxsi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/netscaler.py b/waf/netscaler.py
index c7d4cfe65..c3a5472fd 100644
--- a/waf/netscaler.py
+++ b/waf/netscaler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/newdefend.py b/waf/newdefend.py
index 2984d26ac..c52d61b0d 100644
--- a/waf/newdefend.py
+++ b/waf/newdefend.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/ninjafirewall.py b/waf/ninjafirewall.py
index 126d72f04..c6bddca41 100644
--- a/waf/ninjafirewall.py
+++ b/waf/ninjafirewall.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/onmessageshield.py b/waf/onmessageshield.py
index 9b0df5426..5f5325b25 100644
--- a/waf/onmessageshield.py
+++ b/waf/onmessageshield.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/paloalto.py b/waf/paloalto.py
index 56944f4d6..0faaeb2de 100644
--- a/waf/paloalto.py
+++ b/waf/paloalto.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/perimeterx.py b/waf/perimeterx.py
index d8415292f..298ebdb07 100644
--- a/waf/perimeterx.py
+++ b/waf/perimeterx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/profense.py b/waf/profense.py
index 22c6592e7..b210dab91 100644
--- a/waf/profense.py
+++ b/waf/profense.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/proventia.py b/waf/proventia.py
index fed50242c..3aca6a3d6 100644
--- a/waf/proventia.py
+++ b/waf/proventia.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/radware.py b/waf/radware.py
index a233ddaab..cf12b495b 100644
--- a/waf/radware.py
+++ b/waf/radware.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/reblaze.py b/waf/reblaze.py
index 60cc80fab..e86372df3 100644
--- a/waf/reblaze.py
+++ b/waf/reblaze.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/requestvalidationmode.py b/waf/requestvalidationmode.py
index 94c4ef03d..e60890537 100644
--- a/waf/requestvalidationmode.py
+++ b/waf/requestvalidationmode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/rsfirewall.py b/waf/rsfirewall.py
index adbdb232c..740434fa4 100644
--- a/waf/rsfirewall.py
+++ b/waf/rsfirewall.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/safe3.py b/waf/safe3.py
index 487a0b330..2c2a50049 100644
--- a/waf/safe3.py
+++ b/waf/safe3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/safedog.py b/waf/safedog.py
index 448aaa5e2..7f32eecb4 100644
--- a/waf/safedog.py
+++ b/waf/safedog.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/safeline.py b/waf/safeline.py
index aaf59154e..7d63ea9a0 100644
--- a/waf/safeline.py
+++ b/waf/safeline.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/secureentry.py b/waf/secureentry.py
index 11cd62606..a75efd622 100644
--- a/waf/secureentry.py
+++ b/waf/secureentry.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/secureiis.py b/waf/secureiis.py
index 5202cfc26..32221667a 100644
--- a/waf/secureiis.py
+++ b/waf/secureiis.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/securesphere.py b/waf/securesphere.py
index cdd6d0a40..ec633fbe3 100644
--- a/waf/securesphere.py
+++ b/waf/securesphere.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/senginx.py b/waf/senginx.py
index 244a9a045..d1bdfff8f 100644
--- a/waf/senginx.py
+++ b/waf/senginx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/shieldsecurity.py b/waf/shieldsecurity.py
index fdbc750fa..4f78f06bb 100644
--- a/waf/shieldsecurity.py
+++ b/waf/shieldsecurity.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/siteground.py b/waf/siteground.py
index 075cc5b1c..c412a1406 100644
--- a/waf/siteground.py
+++ b/waf/siteground.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/siteguard.py b/waf/siteguard.py
index 34179ffaa..27843f172 100644
--- a/waf/siteguard.py
+++ b/waf/siteguard.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/sitelock.py b/waf/sitelock.py
index b218ea5d9..42cb0e768 100644
--- a/waf/sitelock.py
+++ b/waf/sitelock.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/sonicwall.py b/waf/sonicwall.py
index bd8e9a89e..9cbec14b8 100644
--- a/waf/sonicwall.py
+++ b/waf/sonicwall.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/sophos.py b/waf/sophos.py
index b0063d199..189a4201c 100644
--- a/waf/sophos.py
+++ b/waf/sophos.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/squarespace.py b/waf/squarespace.py
index 69bea6782..790c278a6 100644
--- a/waf/squarespace.py
+++ b/waf/squarespace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/stackpath.py b/waf/stackpath.py
index a4c46809f..1ffc1b0fd 100644
--- a/waf/stackpath.py
+++ b/waf/stackpath.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/sucuri.py b/waf/sucuri.py
index 172dae0be..c4c2de813 100644
--- a/waf/sucuri.py
+++ b/waf/sucuri.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/tencent.py b/waf/tencent.py
index f9eb6a2e0..75609ae50 100644
--- a/waf/tencent.py
+++ b/waf/tencent.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/trafficshield.py b/waf/trafficshield.py
index 89e109977..c5e694b82 100644
--- a/waf/trafficshield.py
+++ b/waf/trafficshield.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/urlmaster.py b/waf/urlmaster.py
index 96d3f42ab..1f6f56082 100644
--- a/waf/urlmaster.py
+++ b/waf/urlmaster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/urlscan.py b/waf/urlscan.py
index d2a5c0b0c..6fea0d2c4 100644
--- a/waf/urlscan.py
+++ b/waf/urlscan.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/varnish.py b/waf/varnish.py
index a0863bbc4..e2c23a921 100644
--- a/waf/varnish.py
+++ b/waf/varnish.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/virusdie.py b/waf/virusdie.py
index 6cc8e5a93..8f395e909 100644
--- a/waf/virusdie.py
+++ b/waf/virusdie.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/wallarm.py b/waf/wallarm.py
index e1976ba18..ff9ab3fc7 100644
--- a/waf/wallarm.py
+++ b/waf/wallarm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/watchguard.py b/waf/watchguard.py
index ab9292d33..12057ae6d 100644
--- a/waf/watchguard.py
+++ b/waf/watchguard.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/webknight.py b/waf/webknight.py
index 40471dd7f..5bbb7c394 100644
--- a/waf/webknight.py
+++ b/waf/webknight.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/webseal.py b/waf/webseal.py
index 661ec72bc..105f35668 100644
--- a/waf/webseal.py
+++ b/waf/webseal.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/wordfence.py b/waf/wordfence.py
index fa9ee698e..fd98eb4d5 100644
--- a/waf/wordfence.py
+++ b/waf/wordfence.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/wts.py b/waf/wts.py
index eebe28288..38d4a0b1e 100644
--- a/waf/wts.py
+++ b/waf/wts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/yundun.py b/waf/yundun.py
index 62dfc6f01..96dee5a79 100644
--- a/waf/yundun.py
+++ b/waf/yundun.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/yunsuo.py b/waf/yunsuo.py
index 93f41d655..e9052141c 100644
--- a/waf/yunsuo.py
+++ b/waf/yunsuo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
diff --git a/waf/zenedge.py b/waf/zenedge.py
index 54ee9861d..3d27eb07c 100644
--- a/waf/zenedge.py
+++ b/waf/zenedge.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 """
 Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)