Skip to content

Commit c268663

Browse files
stamparmstamparm
committed
Minor code style updates
1 parent a97fd1d commit c268663

26 files changed

+85
-94
lines changed

‎extra/icmpsh/icmpsh_m.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def main(src, dst):
8080
cmd = ''
8181

8282
# Wait for incoming replies
83-
if sock in select.select([ sock ], [], [])[0]:
83+
if sock in select.select([sock], [], [])[0]:
8484
buff = sock.recv(4096)
8585

8686
if 0 == len(buff):

‎extra/mssqlsig/update.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def updateMSSQLXML():
4343

4444
return
4545

46-
releases = re.findall("class=\"BCC_DV_01DarkBlueTitle\">SQL Server\s(.+?)\sBuilds", mssqlVersionsHtmlString, re.I)
46+
releases = re.findall(r"class=\"BCC_DV_01DarkBlueTitle\">SQL Server\s(.+?)\sBuilds", mssqlVersionsHtmlString, re.I)
4747
releasesCount = len(releases)
4848

4949
# Create the minidom document
@@ -74,7 +74,7 @@ def updateMSSQLXML():
7474
stopIdx = mssqlVersionsHtmlString.index("SQL Server %s Builds" % releases[index + 1])
7575

7676
mssqlVersionsReleaseString = mssqlVersionsHtmlString[startIdx:stopIdx]
77-
servicepackVersion = re.findall("</td><td>(7\.0|2000|2005|2008|2008 R2)*(.*?)</td><td.*?([\d\.]+)</td>[\r]*\n", mssqlVersionsReleaseString, re.I)
77+
servicepackVersion = re.findall(r"</td><td>(7\.0|2000|2005|2008|2008 R2)*(.*?)</td><td.*?([\d\.]+)</td>[\r]*\n", mssqlVersionsReleaseString, re.I)
7878

7979
for servicePack, version in servicepackVersion:
8080
if servicePack.startswith(" "):

‎extra/shutils/newlines.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
# Reference: http://rowinggolfer.blogspot.com/2009/08/pylint-recursively.html
55

66
import os
7-
import re
87
import sys
98

109
def check(filepath):
1110
if filepath.endswith(".py"):
12-
content = open(filepath, "rb").read()
13-
#if re.search(r"\r?\n\r?\n", content):
11+
content = open(filepath, "rb").read()
12+
1413
if "\n\n\n" in content:
1514
index = content.find("\n\n\n")
16-
print filepath, repr(content[index-30:index+30])
15+
print filepath, repr(content[index - 30:index + 30])
1716

1817
if __name__ == "__main__":
1918
try:

‎extra/shutils/pep8.sh‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎extra/shutils/pycodestyle.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
# Copyright (c) 2006-2018 sqlmap developers (http://sqlmap.org/)
4+
# See the file 'LICENSE' for copying permission
5+
6+
# Runs pycodestyle on all python files (prerequisite: pip install pycodestyle)
7+
find . -wholename "./thirdparty" -prune -o -type f -iname "*.py" -exec pycodestyle --ignore=E501,E302,E305,E722,E402 '{}' \;

‎extra/shutils/regressiontest.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
SMTP_PORT = 25
2828
SMTP_TIMEOUT = 30
2929
FROM = "regressiontest@sqlmap.org"
30-
#TO = "dev@sqlmap.org"
30+
# TO = "dev@sqlmap.org"
3131
TO = ["bernardo.damele@gmail.com", "miroslav.stampar@gmail.com"]
3232
SUBJECT = "regression test started on %s using revision %s" % (START_TIME, getRevisionNumber())
3333
TARGET = "debian"
@@ -83,7 +83,7 @@ def main():
8383
if stderr:
8484
failure_email("Execution of regression test failed with error:\n\n%s" % stderr)
8585

86-
failed_tests = re.findall("running live test case: (.+?) \((\d+)\/\d+\)[\r]*\n.+test failed (at parsing items: (.+))?\s*\- scan folder: (\/.+) \- traceback: (.*?)( - SQL injection not detected)?[\r]*\n", stdout)
86+
failed_tests = re.findall(r"running live test case: (.+?) \((\d+)\/\d+\)[\r]*\n.+test failed (at parsing items: (.+))?\s*\- scan folder: (\/.+) \- traceback: (.*?)( - SQL injection not detected)?[\r]*\n", stdout)
8787

8888
for failed_test in failed_tests:
8989
title = failed_test[0]

‎lib/core/agent.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def _(pattern, repl, string):
198198
regex = r"(\A|\b)%s=%s%s" % (re.escape(parameter), re.escape(origValue), r"(\Z|\b)" if origValue[-1].isalnum() else "")
199199
retVal = _(regex, "%s=%s" % (parameter, self.addPayloadDelimiters(newValue)), paramString)
200200
else:
201-
retVal = _(r"(\A|\b)%s=%s(\Z|%s|%s|\s)" % (re.escape(parameter), re.escape(origValue), DEFAULT_GET_POST_DELIMITER, DEFAULT_COOKIE_DELIMITER), "%s=%s\g<2>" % (parameter, self.addPayloadDelimiters(newValue)), paramString)
201+
retVal = _(r"(\A|\b)%s=%s(\Z|%s|%s|\s)" % (re.escape(parameter), re.escape(origValue), DEFAULT_GET_POST_DELIMITER, DEFAULT_COOKIE_DELIMITER), r"%s=%s\g<2>" % (parameter, self.addPayloadDelimiters(newValue)), paramString)
202202

203203
if retVal == paramString and urlencode(parameter) != parameter:
204204
retVal = _(r"(\A|\b)%s=%s" % (re.escape(urlencode(parameter)), re.escape(origValue)), "%s=%s" % (urlencode(parameter), self.addPayloadDelimiters(newValue)), paramString)
@@ -535,7 +535,7 @@ def getFields(self, query):
535535
fieldsToCastStr = fieldsToCastStr or ""
536536

537537
# Function
538-
if re.search("\A\w+\(.*\)", fieldsToCastStr, re.I) or (fieldsSelectCase and "WHEN use" not in query) or fieldsSubstr:
538+
if re.search(r"\A\w+\(.*\)", fieldsToCastStr, re.I) or (fieldsSelectCase and "WHEN use" not in query) or fieldsSubstr:
539539
fieldsToCastList = [fieldsToCastStr]
540540
else:
541541
fieldsToCastList = splitFields(fieldsToCastStr)
@@ -627,7 +627,7 @@ def concatQuery(self, query, unpack=True):
627627
concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'||" % kb.chars.start, 1)
628628
_ = unArrayizeValue(zeroDepthSearch(concatenatedQuery, " FROM "))
629629
concatenatedQuery = "%s||'%s'%s" % (concatenatedQuery[:_], kb.chars.stop, concatenatedQuery[_:])
630-
concatenatedQuery = re.sub(r"('%s'\|\|)(.+)(%s)" % (kb.chars.start, re.escape(castedFields)), "\g<2>\g<1>\g<3>", concatenatedQuery)
630+
concatenatedQuery = re.sub(r"('%s'\|\|)(.+)(%s)" % (kb.chars.start, re.escape(castedFields)), r"\g<2>\g<1>\g<3>", concatenatedQuery)
631631
elif fieldsSelect:
632632
concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'||" % kb.chars.start, 1)
633633
concatenatedQuery += "||'%s'" % kb.chars.stop
@@ -639,7 +639,7 @@ def concatQuery(self, query, unpack=True):
639639
concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'+" % kb.chars.start, 1)
640640
concatenatedQuery += "+'%s'" % kb.chars.stop
641641
elif fieldsSelectTop:
642-
topNum = re.search("\ASELECT\s+TOP\s+([\d]+)\s+", concatenatedQuery, re.I).group(1)
642+
topNum = re.search(r"\ASELECT\s+TOP\s+([\d]+)\s+", concatenatedQuery, re.I).group(1)
643643
concatenatedQuery = concatenatedQuery.replace("SELECT TOP %s " % topNum, "TOP %s '%s'+" % (topNum, kb.chars.start), 1)
644644
concatenatedQuery = concatenatedQuery.replace(" FROM ", "+'%s' FROM " % kb.chars.stop, 1)
645645
elif fieldsSelectCase:

‎lib/core/common.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@ def parseTargetDirect():
13171317
remote = False
13181318

13191319
for dbms in SUPPORTED_DBMS:
1320-
details = re.search("^(?P<dbms>%s)://(?P<credentials>(?P<user>.+?)\:(?P<pass>.*)\@)?(?P<remote>(?P<hostname>[\w.-]+?)\:(?P<port>[\d]+)\/)?(?P<db>[\w\d\ \:\.\_\-\/\\\\]+?)$" % dbms, conf.direct, re.I)
1320+
details = re.search(r"^(?P<dbms>%s)://(?P<credentials>(?P<user>.+?)\:(?P<pass>.*)\@)?(?P<remote>(?P<hostname>[\w.-]+?)\:(?P<port>[\d]+)\/)?(?P<db>[\w\d\ \:\.\_\-\/\\]+?)$" % dbms, conf.direct, re.I)
13211321

13221322
if details:
13231323
conf.dbms = details.group("dbms")
@@ -1440,7 +1440,7 @@ def parseTargetUrl():
14401440
errMsg += "in the hostname part"
14411441
raise SqlmapGenericException(errMsg)
14421442

1443-
hostnamePort = urlSplit.netloc.split(":") if not re.search(r"\[.+\]", urlSplit.netloc) else filter(None, (re.search("\[.+\]", urlSplit.netloc).group(0), re.search(r"\](:(?P<port>\d+))?", urlSplit.netloc).group("port")))
1443+
hostnamePort = urlSplit.netloc.split(":") if not re.search(r"\[.+\]", urlSplit.netloc) else filter(None, (re.search(r"\[.+\]", urlSplit.netloc).group(0), re.search(r"\](:(?P<port>\d+))?", urlSplit.netloc).group("port")))
14441444

14451445
conf.scheme = (urlSplit.scheme.strip().lower() or "http") if not conf.forceSSL else "https"
14461446
conf.path = urlSplit.path.strip()
@@ -3355,7 +3355,7 @@ def createGithubIssue(errMsg, excMsg):
33553355

33563356
_ = re.sub(r"'[^']+'", "''", excMsg)
33573357
_ = re.sub(r"\s+line \d+", "", _)
3358-
_ = re.sub(r'File ".+?/(\w+\.py)', "\g<1>", _)
3358+
_ = re.sub(r'File ".+?/(\w+\.py)', r"\g<1>", _)
33593359
_ = re.sub(r".+\Z", "", _)
33603360
key = hashlib.md5(_).hexdigest()[:8]
33613361

@@ -3522,6 +3522,7 @@ def _(value):
35223522
regex = r"%s\b" % regex
35233523

35243524
_retVal = [retVal]
3525+
35253526
def _thread(regex):
35263527
try:
35273528
_retVal[0] = re.sub(r"(?i)%s" % regex, REFLECTED_VALUE_MARKER, _retVal[0])
@@ -3957,6 +3958,7 @@ class _(StringIO):
39573958
def __init__(self, content, url):
39583959
StringIO.__init__(self, unicodeencode(content, kb.pageEncoding) if isinstance(content, unicode) else content)
39593960
self._url = url
3961+
39603962
def geturl(self):
39613963
return self._url
39623964

@@ -4082,7 +4084,7 @@ def getHostHeader(url):
40824084
retVal = urlparse.urlparse(url).netloc
40834085

40844086
if re.search(r"http(s)?://\[.+\]", url, re.I):
4085-
retVal = extractRegexResult("http(s)?://\[(?P<result>.+)\]", url)
4087+
retVal = extractRegexResult(r"http(s)?://\[(?P<result>.+)\]", url)
40864088
elif any(retVal.endswith(':%d' % _) for _ in (80, 443)):
40874089
retVal = retVal.split(':')[0]
40884090

@@ -4339,7 +4341,7 @@ def resetCookieJar(cookieJar):
43394341

43404342
except cookielib.LoadError, msg:
43414343
errMsg = "there was a problem loading "
4342-
errMsg += "cookies file ('%s')" % re.sub(r"(cookies) file '[^']+'", "\g<1>", str(msg))
4344+
errMsg += "cookies file ('%s')" % re.sub(r"(cookies) file '[^']+'", r"\g<1>", str(msg))
43434345
raise SqlmapGenericException(errMsg)
43444346

43454347
def decloakToTemp(filename):

‎lib/core/decorators.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ def _(*args, **kwargs):
3838

3939
return result
4040

41-
return _
41+
return _

‎lib/core/option.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,7 +1722,7 @@ def _cleanupOptions():
17221722

17231723
if conf.testFilter:
17241724
conf.testFilter = conf.testFilter.strip('*+')
1725-
conf.testFilter = re.sub(r"([^.])([*+])", "\g<1>.\g<2>", conf.testFilter)
1725+
conf.testFilter = re.sub(r"([^.])([*+])", r"\g<1>.\g<2>", conf.testFilter)
17261726

17271727
try:
17281728
re.compile(conf.testFilter)
@@ -1731,7 +1731,7 @@ def _cleanupOptions():
17311731

17321732
if conf.testSkip:
17331733
conf.testSkip = conf.testSkip.strip('*+')
1734-
conf.testSkip = re.sub(r"([^.])([*+])", "\g<1>.\g<2>", conf.testSkip)
1734+
conf.testSkip = re.sub(r"([^.])([*+])", r"\g<1>.\g<2>", conf.testSkip)
17351735

17361736
try:
17371737
re.compile(conf.testSkip)

0 commit comments

Comments
 (0)