From 4e36bbaff92ea4069ddb008280fe3a490f6f1c04 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sun, 4 Sep 2016 03:09:28 +0200
Subject: [PATCH] Update related to the last commit

---
 lib/core/settings.py |  2 +-
 sqlmap.py            | 13 +++++++------
 txt/checksum.md5     |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 3a7bdd896..5184911a0 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.9.5"
+VERSION = "1.0.9.6"
 REVISION = getRevisionNumber()
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
diff --git a/sqlmap.py b/sqlmap.py
index 233e6201d..eb4ab347c 100755
--- a/sqlmap.py
+++ b/sqlmap.py
@@ -85,9 +85,6 @@ def modulePath():
     return getUnicode(os.path.dirname(os.path.realpath(_)), encoding=sys.getfilesystemencoding() or UNICODE_ENCODING)
 
 def checkEnvironment():
-    global conf
-    global kb
-
     try:
         os.path.isdir(modulePath())
     except UnicodeEncodeError:
@@ -104,10 +101,14 @@ def checkEnvironment():
         logger.critical(errMsg)
         raise SystemExit
 
-    # Patch for pip environment
+    # Patch for pip (import) environment
     if "sqlmap.sqlmap" in sys.modules:
-        kb = sys.modules["lib.core.data"].kb
-        conf = sys.modules["lib.core.data"].conf
+        for _ in ("cmdLineOptions", "conf", "kb"):
+            globals()[_] = getattr(sys.modules["lib.core.data"], _)
+
+        for _ in ("SqlmapBaseException", "SqlmapShellQuitException", "SqlmapSilentQuitException", "SqlmapUserQuitException"):
+            globals()[_] = getattr(sys.modules["lib.core.exception"], _)
+
 
 def main():
     """
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index 2a9018a27..b93a38b0b 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -45,7 +45,7 @@ e60456db5380840a586654344003d4e6  lib/core/readlineng.py
 5ef56abb8671c2ca6ceecb208258e360  lib/core/replication.py
 99a2b496b9d5b546b335653ca801153f  lib/core/revision.py
 7c15dd2777af4dac2c89cab6df17462e  lib/core/session.py
-b665e9ff92a2b1010d39c6dabc9a44e4  lib/core/settings.py
+c8d50922b448e3d60c4b0812da8748ab  lib/core/settings.py
 7af83e4f18cab6dff5e67840eb65be80  lib/core/shell.py
 23657cd7d924e3c6d225719865855827  lib/core/subprocessng.py
 0bc2fae1dec18cdd11954b22358293f2  lib/core/target.py
@@ -218,7 +218,7 @@ c3cc8b7727161e64ab59f312c33b541a  shell/stager.aspx_
 1f7f125f30e0e800beb21e2ebbab18e1  shell/stager.jsp_
 01e3505e796edf19aad6a996101c81c9  shell/stager.php_
 56702e95555adee718b6a11ee7098fd4  sqlmapapi.py
-148e4180a3e19ef26839ba49a9d2d3c7  sqlmap.py
+3d4d59905db17705e7c74680f928199b  sqlmap.py
 1316deb997418507e76221c84ec99946  tamper/apostrophemask.py
 a6efe8f914c769c52afec703bd73609f  tamper/apostrophenullencode.py
 b1c56983919b69f4f6f0e7929c881e7a  tamper/appendnullbyte.py