0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixing findRegexp()

Browse source
This commit is contained in:
Rolux 2008-04-29 15:17:10 +02:00
parent d5d58dba34
commit f014904704
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
oxutils/text.py
View file

@ -5,18 +5,21 @@ import re
def findRegexp(string, regexp): def findRegexp(string, regexp):
return re.compile(regexp, re.DOTALL).findall(string) result = re.compile(regexp, re.DOTALL).findall(string)
if result:
return result[0].strip()
return None
def findString(string, string0, string1 = ''): def findString(string, string0, string1 = ''):
if string0:
string0 = re.escape(string0) string0 = re.escape(string0)
else:
string0 = '^'
if string1: if string1:
string1 = re.escape(string1) string1 = re.escape(string1)
else: else:
string1 = '$' string1 = '$'
result = findRegexp(string, string0 + '(.*?)' + string1) return 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:]