Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2d05174

Browse files
committed
Trivial update
1 parent 5f2bb88 commit 2d05174

18 files changed

Lines changed: 71 additions & 71 deletions

File tree

extra/shutils/regressiontest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def prepare_email(content):
4040
msg = MIMEMultipart()
4141
msg["Subject"] = SUBJECT
4242
msg["From"] = FROM
43-
msg["To"] = TO if isinstance(TO, basestring) else ",".join(TO)
43+
msg["To"] = TO if isinstance(TO, basestring) else ','.join(TO)
4444

4545
msg.attach(MIMEText(content))
4646

lib/core/agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def payloadDirect(self, query):
6363

6464
if Backend.getIdentifiedDbms() in (DBMS.ORACLE,): # non-standard object(s) make problems to a database connector while returned (e.g. XMLTYPE)
6565
_, _, _, _, _, _, fieldsToCastStr, _ = self.getFields(query)
66-
for field in fieldsToCastStr.split(","):
66+
for field in fieldsToCastStr.split(','):
6767
query = query.replace(field, self.nullAndCastField(field))
6868

6969
if kb.tamperFunctions:

lib/core/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ def readInput(message, default=None, checkBatch=True, boolean=False):
10021002
if retVal is None:
10031003
if checkBatch and conf.get("batch"):
10041004
if isListLike(default):
1005-
options = ",".join(getUnicode(opt, UNICODE_ENCODING) for opt in default)
1005+
options = ','.join(getUnicode(opt, UNICODE_ENCODING) for opt in default)
10061006
elif default:
10071007
options = getUnicode(default, UNICODE_ENCODING)
10081008
else:

lib/core/defaults.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from lib.core.datatype import AttribDict
99

1010
_defaults = {
11-
"csvDel": ",",
11+
"csvDel": ',',
1212
"timeSec": 5,
1313
"googlePage": 1,
1414
"verbose": 1,

lib/core/option.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,13 +1766,13 @@ def _cleanupOptions():
17661766
conf.torType = conf.torType.upper()
17671767

17681768
if conf.col:
1769-
conf.col = re.sub(r"\s*,\s*", ",", conf.col)
1769+
conf.col = re.sub(r"\s*,\s*", ',', conf.col)
17701770

17711771
if conf.excludeCol:
1772-
conf.excludeCol = re.sub(r"\s*,\s*", ",", conf.excludeCol)
1772+
conf.excludeCol = re.sub(r"\s*,\s*", ',', conf.excludeCol)
17731773

17741774
if conf.binaryFields:
1775-
conf.binaryFields = re.sub(r"\s*,\s*", ",", conf.binaryFields)
1775+
conf.binaryFields = re.sub(r"\s*,\s*", ',', conf.binaryFields)
17761776

17771777
if any((conf.proxy, conf.proxyFile, conf.tor)):
17781778
conf.disablePrecon = True

lib/core/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from lib.core.enums import OS
2020

2121
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
22-
VERSION = "1.1.4.32"
22+
VERSION = "1.1.4.33"
2323
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2424
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2525
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

lib/techniques/union/use.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ def unionThread():
378378
del threadData.shared.buffered[0]
379379

380380
if conf.verbose == 1 and not (threadData.resumed and kb.suppressResumeInfo) and not threadData.shared.showEta:
381-
_ = ",".join("\"%s\"" % _ for _ in flattenValue(arrayizeValue(items))) if not isinstance(items, basestring) else items
381+
_ = ','.join("\"%s\"" % _ for _ in flattenValue(arrayizeValue(items))) if not isinstance(items, basestring) else items
382382
status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", _ if kb.safeCharEncode else safecharencode(_))
383383

384384
if len(status) > width:

plugins/dbms/maxdb/enumeration.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def getTables(self, bruteForce=None):
6565
conf.db = self.getCurrentDb()
6666

6767
if conf.db:
68-
dbs = conf.db.split(",")
68+
dbs = conf.db.split(',')
6969
else:
7070
dbs = self.getDbs()
7171

@@ -116,7 +116,7 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
116116
conf.db = safeSQLIdentificatorNaming(conf.db)
117117

118118
if conf.col:
119-
colList = conf.col.split(",")
119+
colList = conf.col.split(',')
120120
else:
121121
colList = []
122122

@@ -127,7 +127,7 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
127127
colList[colList.index(col)] = safeSQLIdentificatorNaming(col)
128128

129129
if conf.tbl:
130-
tblList = conf.tbl.split(",")
130+
tblList = conf.tbl.split(',')
131131
else:
132132
self.getTables()
133133

plugins/dbms/mssqlserver/enumeration.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def getTables(self):
7575
conf.db = self.getCurrentDb()
7676

7777
if conf.db:
78-
dbs = conf.db.split(",")
78+
dbs = conf.db.split(',')
7979
else:
8080
dbs = self.getDbs()
8181

@@ -163,7 +163,7 @@ def getTables(self):
163163

164164
def searchTable(self):
165165
foundTbls = {}
166-
tblList = conf.tbl.split(",")
166+
tblList = conf.tbl.split(',')
167167
rootQuery = queries[DBMS.MSSQL].search_table
168168
tblCond = rootQuery.inband.condition
169169
tblConsider, tblCondParam = self.likeOrExact("table")
@@ -172,7 +172,7 @@ def searchTable(self):
172172
conf.db = self.getCurrentDb()
173173

174174
if conf.db:
175-
enumDbs = conf.db.split(",")
175+
enumDbs = conf.db.split(',')
176176
elif not len(kb.data.cachedDbs):
177177
enumDbs = self.getDbs()
178178
else:
@@ -269,7 +269,7 @@ def searchColumn(self):
269269
whereTblsQuery = ""
270270
infoMsgTbl = ""
271271
infoMsgDb = ""
272-
colList = conf.col.split(",")
272+
colList = conf.col.split(',')
273273

274274
if conf.excludeCol:
275275
colList = [_ for _ in colList if _ not in conf.excludeCol.split(',')]
@@ -284,7 +284,7 @@ def searchColumn(self):
284284
conf.db = self.getCurrentDb()
285285

286286
if conf.db:
287-
enumDbs = conf.db.split(",")
287+
enumDbs = conf.db.split(',')
288288
elif not len(kb.data.cachedDbs):
289289
enumDbs = self.getDbs()
290290
else:
@@ -307,15 +307,15 @@ def searchColumn(self):
307307
foundCols[column] = {}
308308

309309
if conf.tbl:
310-
_ = conf.tbl.split(",")
310+
_ = conf.tbl.split(',')
311311
whereTblsQuery = " AND (" + " OR ".join("%s = '%s'" % (tblCond, unsafeSQLIdentificatorNaming(tbl)) for tbl in _) + ")"
312312
infoMsgTbl = " for table%s '%s'" % ("s" if len(_) > 1 else "", ", ".join(tbl for tbl in _))
313313

314314
if conf.db == CURRENT_DB:
315315
conf.db = self.getCurrentDb()
316316

317317
if conf.db:
318-
_ = conf.db.split(",")
318+
_ = conf.db.split(',')
319319
infoMsgDb = " in database%s '%s'" % ("s" if len(_) > 1 else "", ", ".join(db for db in _))
320320
elif conf.excludeSysDbs:
321321
msg = "skipping system database%s '%s'" % ("s" if len(self.excludeDbsList) > 1 else "", ", ".join(db for db in self.excludeDbsList))

plugins/dbms/oracle/enumeration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def getRoles(self, query2=False):
5050
condition = rootQuery.inband.condition
5151

5252
if conf.user:
53-
users = conf.user.split(",")
53+
users = conf.user.split(',')
5454
query += " WHERE "
5555
query += " OR ".join("%s = '%s'" % (condition, user) for user in sorted(users))
5656

@@ -86,7 +86,7 @@ def getRoles(self, query2=False):
8686

8787
if not kb.data.cachedUsersRoles and isInferenceAvailable() and not conf.direct:
8888
if conf.user:
89-
users = conf.user.split(",")
89+
users = conf.user.split(',')
9090
else:
9191
if not len(kb.data.cachedUsers):
9292
users = self.getUsers()

0 commit comments

Comments
 (0)