summaryrefslogtreecommitdiff
path: root/gobject/glib-mkenums.in
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2017-07-17 16:29:40 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2017-07-17 16:29:40 +0100
commit2219cfb92daf9b9413de35a1089efa3a1dff7602 (patch)
tree1b4d82298b9b04c465170992f1ccd236db905dee /gobject/glib-mkenums.in
parentf18556749c75629b9bff538dced6311cf77a3ffb (diff)
downloadglib-2219cfb92daf9b9413de35a1089efa3a1dff7602.tar.gz
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.
Diffstat (limited to 'gobject/glib-mkenums.in')
-rwxr-xr-xgobject/glib-mkenums.in16
1 files changed, 14 insertions, 2 deletions
diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index 8b8dac898..3b9a30c78 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -115,7 +115,13 @@ def parse_entries(file, file_name):
global entries, enumindex, enumname, seenbitshift, flags
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
while re.search(r'/\*([^*]|\*(?!/))*$', line):
line += file.readline()
@@ -396,7 +402,13 @@ def process_file(curfilename):
print_warning('No file "{}" found.'.format(curfilename))
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
while re.search(r'/\*([^*]|\*(?!/))*$', line):
line += curfile.readline()