xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

[svn] Fixed the following of *includes by adding white space to the end of the regex.

Browse Source
This commit is contained in:
martin speleo 2009-07-03 23:56:39 +01:00
parent 4917d7e747
commit 64db29fa98
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parsers/survex.py
View File

@ -23,8 +23,8 @@ roles = {"Insts": "Insts",
"Tape": "Tape", "Tape": "Tape",
"tape": "Tape"} "tape": "Tape"}
re_include_extension = re.compile(r"^\s*\*include\s+([^\s]*).svx$", re.IGNORECASE) re_include_extension = re.compile(r"^\s*\*include\s+([^\s]*).svx\s*$", re.IGNORECASE)
re_include_no_extension = re.compile(r"^\s*\*include\s+([^\s]*)$", re.IGNORECASE) re_include_no_extension = re.compile(r"^\s*\*include\s+([^\s]*)\s*$", re.IGNORECASE)
flags = {"begin": re.compile(r"^\s*\*begin\s+(.*?)\s*$", re.IGNORECASE), flags = {"begin": re.compile(r"^\s*\*begin\s+(.*?)\s*$", re.IGNORECASE),
"end": re.compile(r"^\s*\*end\s+(.*?)\s*$", re.IGNORECASE), "end": re.compile(r"^\s*\*end\s+(.*?)\s*$", re.IGNORECASE),
"date": re.compile(r"^\s*\*date\s+(.*?)\s*$", re.IGNORECASE), "date": re.compile(r"^\s*\*date\s+(.*?)\s*$", re.IGNORECASE),
@ -94,12 +94,12 @@ def make_model(name, parent, iter_lines, sf, c, l):
m.end_file = survex_file m.end_file = survex_file
m.end_char = count m.end_char = count
if m.start_day: if m.start_day:
m.date = "%04d-%02d-%02d" % (int(m.start_year), int(m.start_month), int(m.start_day)) m.date = "%04d-%02d-%02d" % (int(m.start_year), int(m.start_month), int(m.start_day))
m.save() m.save()
team = [] team = []
file_year = None file_year = None
for survex_file, count, line in iter_lines: for survex_file, count, line in iter_lines: