fixing findString()
This commit is contained in:
parent
d139384dce
commit
a8d0d8ac8b
1 changed files with 11 additions and 7 deletions
|
@ -5,15 +5,19 @@ import re
|
||||||
|
|
||||||
|
|
||||||
def findRegexp(string, regexp):
|
def findRegexp(string, regexp):
|
||||||
result = None
|
print string, regexp
|
||||||
regexp = re.compile(regexp, re.DOTALL)
|
return re.compile(regexp, re.DOTALL).findall(string)
|
||||||
match = regexp.search(string)
|
|
||||||
if match:
|
|
||||||
result = match.group(1)
|
|
||||||
return result
|
|
||||||
|
|
||||||
def findString(string, string0, string1 = ''):
|
def findString(string, string0, string1 = ''):
|
||||||
return findRegexp(string, re.escape(string0) + '(.*?)' + re.escape(string1))
|
string0 = re.escape(string0)
|
||||||
|
if string1:
|
||||||
|
string1 = re.escape(string1)
|
||||||
|
else:
|
||||||
|
string1 = '$'
|
||||||
|
result = findRegexp(string, string0 + '(.*?)' + string1)
|
||||||
|
if result:
|
||||||
|
return result[0].strip()
|
||||||
|
return None
|
||||||
|
|
||||||
# Capitalizes the first letter of a string.
|
# Capitalizes the first letter of a string.
|
||||||
capfirst = lambda x: x and x[0].upper() + x[1:]
|
capfirst = lambda x: x and x[0].upper() + x[1:]
|
||||||
|
|
Loading…
Reference in a new issue