Merge branch 'master' into faster_absolute_reimports

2 files changed, 5 insertions, 3 deletions

diff --git a/Cython/Compiler/Parsing.py b/Cython/Compiler/Parsing.py
index 3879a75af..4e5d443eb 100644
--- a/Cython/Compiler/Parsing.py
+++ b/Cython/Compiler/Parsing.py
@@ -65,7 +65,7 @@ class Ctx(object):
 
 def p_ident(s, message="Expected an identifier"):
     if s.sy == 'IDENT':
-        name = s.systring
+        name = s.context.intern_ustring(s.systring)
         s.next()
         return name
     else:
@@ -74,7 +74,7 @@ def p_ident(s, message="Expected an identifier"):
 def p_ident_list(s):
     names = []
     while s.sy == 'IDENT':
-        names.append(s.systring)
+        names.append(s.context.intern_ustring(s.systring))
         s.next()
         if s.sy != ',':
             break
diff --git a/runtests.py b/runtests.py
index 813ebad83..7c213302a 100755
--- a/runtests.py
+++ b/runtests.py
@@ -784,7 +784,9 @@ class TestBuilder(object):
             os.makedirs(language_workdir)
         workdir = os.path.join(language_workdir, module)
         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,
                           language=language,
                           preparse=preparse,