sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scons: Fix Python 2.6 compatibility

Browse source 
Don't use Python 2.7-style with statements in the SConstruct file.
This commit is contained in:
Andreas Sandberg 2016-04-18 10:40:50 +01:00
parent f819518158
commit 68a7752d73
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
SConstruct
View file

@ -332,25 +332,23 @@ if not ignore_style and hgdir.exists():
shutil.copyfile(hgrc.abspath, hgrc_old.abspath) shutil.copyfile(hgrc.abspath, hgrc_old.abspath)
re_style_hook = re.compile(r"^([^=#]+)\.style\s*=\s*([^#\s]+).*") re_style_hook = re.compile(r"^([^=#]+)\.style\s*=\s*([^#\s]+).*")
re_style_extension = re.compile("style\s*=\s*([^#\s]+).*") re_style_extension = re.compile("style\s*=\s*([^#\s]+).*")
with open(hgrc_old.abspath, 'r') as old, \ old, new = open(hgrc_old.abspath, 'r'), open(hgrc.abspath, 'w')
open(hgrc.abspath, 'w') as new: for l in old:
m_hook = re_style_hook.match(l)
m_ext = re_style_extension.match(l)
if m_hook:
hook, check = m_hook.groups()
if check != "python:style.check_style":
print "Warning: %s.style is using a non-default " \
"checker: %s" % (hook, check)
if hook not in ("pretxncommit", "pre-qrefresh"):
print "Warning: Updating unknown style hook: %s" % hook
for l in old: l = "%s.style = python:hgstyle.check_style\n" % hook
m_hook = re_style_hook.match(l) elif m_ext and m_ext.group(1) == style_extension:
m_ext = re_style_extension.match(l) l = "hgstyle = %s/util/hgstyle.py\n" % main.root.abspath
if m_hook:
hook, check = m_hook.groups()
if check != "python:style.check_style":
print "Warning: %s.style is using a non-default " \
"checker: %s" % (hook, check)
if hook not in ("pretxncommit", "pre-qrefresh"):
print "Warning: Updating unknown style hook: %s" % hook
l = "%s.style = python:hgstyle.check_style\n" % hook new.write(l)
elif m_ext and m_ext.group(1) == style_extension:
l = "hgstyle = %s/util/hgstyle.py\n" % main.root.abspath
new.write(l)
elif not style_hook: elif not style_hook:
print mercurial_style_message, print mercurial_style_message,
# continue unless user does ctrl-c/ctrl-d etc. # continue unless user does ctrl-c/ctrl-d etc.