From 2f2a63334a5f1b368172d119ba1bf2611247d3c1 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 23 Sep 2016 13:39:27 +0200 Subject: [PATCH] Minor cleanup --- lib/core/agent.py | 14 +++++++------- lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/core/agent.py b/lib/core/agent.py index 86ceb45e8..62a0458f8 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -507,26 +507,26 @@ class Agent(object): if fieldsSubstr: fieldsToCastStr = query elif fieldsMinMaxstr: - fieldsToCastStr = fieldsMinMaxstr.groups()[0] + fieldsToCastStr = fieldsMinMaxstr.group(1) elif fieldsExists: if fieldsSelect: - fieldsToCastStr = fieldsSelect.groups()[0] + fieldsToCastStr = fieldsSelect.group(1) elif fieldsSelectTop: - fieldsToCastStr = fieldsSelectTop.groups()[0] + fieldsToCastStr = fieldsSelectTop.group(1) elif fieldsSelectRownum: - fieldsToCastStr = fieldsSelectRownum.groups()[0] + fieldsToCastStr = fieldsSelectRownum.group(1) elif fieldsSelectDistinct: if Backend.getDbms() in (DBMS.HSQLDB,): fieldsToCastStr = fieldsNoSelect else: - fieldsToCastStr = fieldsSelectDistinct.groups()[0] + fieldsToCastStr = fieldsSelectDistinct.group(1) elif fieldsSelectCase: - fieldsToCastStr = fieldsSelectCase.groups()[0] + fieldsToCastStr = fieldsSelectCase.group(1) elif fieldsSelectFrom: fieldsToCastStr = query[:unArrayizeValue(_)] if _ else query fieldsToCastStr = re.sub(r"\ASELECT%s\s+" % prefixRegex, "", fieldsToCastStr) elif fieldsSelect: - fieldsToCastStr = fieldsSelect.groups()[0] + fieldsToCastStr = fieldsSelect.group(1) # Function if re.search("\A\w+\(.*\)", fieldsToCastStr, re.I) or (fieldsSelectCase and "WHEN use" not in query) or fieldsSubstr: diff --git a/lib/core/settings.py b/lib/core/settings.py index f345704d9..df6c57819 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 (...) -VERSION = "1.0.9.25" +VERSION = "1.0.9.26" 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/txt/checksum.md5 b/txt/checksum.md5 index ce40de5d8..b48a72771 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -24,7 +24,7 @@ cc9c82cfffd8ee9b25ba3af6284f057e extra/sqlharvest/__init__.py 7c5ba631796f12d6de9b667e4cc7812b lib/controller/controller.py 0a64305c3b3a01a2fc3a5e6204f442f1 lib/controller/handler.py cc9c82cfffd8ee9b25ba3af6284f057e lib/controller/__init__.py -ac60b40a705f806562e6e4f761fb0ecc lib/core/agent.py +ed9303846f0bc63a9c518a7164301f80 lib/core/agent.py eb0bd28b0bd9fbf67dcc3119116df377 lib/core/bigarray.py d11993cd69f919216a9e4d54c77bb020 lib/core/common.py 5680d0c446a3bed5c0f2a0402d031557 lib/core/convert.py @@ -45,7 +45,7 @@ e60456db5380840a586654344003d4e6 lib/core/readlineng.py 5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py 99a2b496b9d5b546b335653ca801153f lib/core/revision.py 7c15dd2777af4dac2c89cab6df17462e lib/core/session.py -30b65f0e46bb9b05e02863d1bb386925 lib/core/settings.py +31410f210c5fb551a3dbfa7d8e64c013 lib/core/settings.py 7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py 23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py 0bc2fae1dec18cdd11954b22358293f2 lib/core/target.py