Commit 33e73a70 authored by Stefan Behnel's avatar Stefan Behnel

Merge branch 'master' into faster_absolute_reimports

parents d5392ffc 8a08c4f7
...@@ -65,7 +65,7 @@ class Ctx(object): ...@@ -65,7 +65,7 @@ class Ctx(object):
def p_ident(s, message="Expected an identifier"): def p_ident(s, message="Expected an identifier"):
if s.sy == 'IDENT': if s.sy == 'IDENT':
name = s.systring name = s.context.intern_ustring(s.systring)
s.next() s.next()
return name return name
else: else:
...@@ -74,7 +74,7 @@ def p_ident(s, message="Expected an identifier"): ...@@ -74,7 +74,7 @@ def p_ident(s, message="Expected an identifier"):
def p_ident_list(s): def p_ident_list(s):
names = [] names = []
while s.sy == 'IDENT': while s.sy == 'IDENT':
names.append(s.systring) names.append(s.context.intern_ustring(s.systring))
s.next() s.next()
if s.sy != ',': if s.sy != ',':
break break
......
...@@ -784,7 +784,9 @@ class TestBuilder(object): ...@@ -784,7 +784,9 @@ class TestBuilder(object):
os.makedirs(language_workdir) os.makedirs(language_workdir)
workdir = os.path.join(language_workdir, module) workdir = os.path.join(language_workdir, module)
if preparse != 'id': if preparse != 'id':
workdir += '_%s' % str(preparse) workdir += '_%s' % (preparse,)
if language_level:
workdir += '_cy%d' % (language_level,)
return test_class(path, workdir, module, tags, return test_class(path, workdir, module, tags,
language=language, language=language,
preparse=preparse, preparse=preparse,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment