mkenums: Keep compatibility with Python 2.x

Since every other tool in GLib is allowed to be used with Python 2.x,
glib-mkenums should follow suit.
This commit is contained in:
Emmanuele Bassi 2017-07-17 16:29:40 +01:00
parent f18556749c
commit 2219cfb92d

View File

@ -115,7 +115,13 @@ def parse_entries(file, file_name):
global entries, enumindex, enumname, seenbitshift, flags global entries, enumindex, enumname, seenbitshift, flags
looking_for_name = False looking_for_name = False
for line in file: while True:
line = file.readline()
if not line:
break
line = line.strip()
# read lines until we have no open comments # read lines until we have no open comments
while re.search(r'/\*([^*]|\*(?!/))*$', line): while re.search(r'/\*([^*]|\*(?!/))*$', line):
line += file.readline() line += file.readline()
@ -396,7 +402,13 @@ def process_file(curfilename):
print_warning('No file "{}" found.'.format(curfilename)) print_warning('No file "{}" found.'.format(curfilename))
return return
for line in curfile: while True:
line = curfile.readline()
if not line:
break
line = line.strip()
# read lines until we have no open comments # read lines until we have no open comments
while re.search(r'/\*([^*]|\*(?!/))*$', line): while re.search(r'/\*([^*]|\*(?!/))*$', line):
line += curfile.readline() line += curfile.readline()