D-Bus Testing: fixed scanFiles()

The function must return all property assignments, including those
which are commented out. The Python version accidentally included some
comment lines which looked like assignments, partly because it ignored
leading spaces, partly because it looked anywhere in the line for an
equal sign.

Fixed by using a regex for the matching.
This commit is contained in:
Patrick Ohly 2012-04-16 17:26:12 +02:00
parent 5389b8eeed
commit 0e63bc8e59
1 changed files with 7 additions and 5 deletions

View File

@ -3451,13 +3451,15 @@ def createFiles(root, content, append = False):
outfile.write(line + "\n")
outfile.close()
isPropRegEx = re.compile(r'^([a-zA-Z]+) = ')
def isPropAssignment (line):
line = line.lstrip()
if (line.startswith("KCalExtended = ") or line.startswith("mkcal = ") or line.startswith("QtContacts = ")):
m = isPropRegEx.search(line)
if not m:
return False
if line.find(" = ") > -1:
return True
return False
# exclude some false positives
if m.group(1) in ('KCalExtended', 'mkcal', 'QtContacts'):
return False
return True
def scanFiles(root, peer = '', onlyProps = True, directory = ''):
newroot = root + '/' + directory