walkero
/
flawfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Replace some string.find/rfind for Python 2/3 compatibility 

Signed-off-by: David A. Wheeler <dwheeler@dwheeler.com>
This commit is contained in:
David A. Wheeler 2017-08-13 10:11:58 -04:00
parent 94164014da
commit 0a1761b10b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flawfinder
View File

@ -1336,7 +1336,7 @@ template_ruleset = {
def find_column(text, position): def find_column(text, position):
"Find column number inside line." "Find column number inside line."
newline = string.rfind(text, "\n", 0, position) newline = text.rfind("\n", 0, position)
if newline == -1: if newline == -1:
return position + 1 return position + 1
return position - newline return position - newline
@ -1344,8 +1344,8 @@ def find_column(text, position):
def get_context(text, position): def get_context(text, position):
"Get surrounding text line starting from text[position]" "Get surrounding text line starting from text[position]"
linestart = string.rfind(text, "\n", 0, position + 1) + 1 linestart = text.rfind("\n", 0, position + 1) + 1
lineend = string.find(text, "\n", position, len(text)) lineend = text.find("\n", position, len(text))
if lineend == -1: if lineend == -1:
lineend = len(text) lineend = len(text)
return text[linestart:lineend] return text[linestart:lineend]