Commits

Alex Gaynor committed 69e8fe5

Include the root of the module name in the files that are generated by translation.

Comments (0)

Files changed (4)

pypy/rlib/rsre/rsre_re.py

             else:
                 item = match.groups("")
             matchlist.append(item)
-        return matchlist        
+        return matchlist
 
     def finditer(self, string, pos=0, endpos=sys.maxint):
         return iter(self.scanner(string, pos, endpos).search, None)

pypy/translator/c/genc.py

                     localpath = py.path.local(g.filename)
                     pypkgpath = localpath.pypkgpath()
                     if pypkgpath:
-                        relpypath =  localpath.relto(pypkgpath)
+                        relpypath = localpath.relto(pypkgpath.dirname)
                         return relpypath.replace('.py', '.c')
             return None
         if hasattr(node.obj, 'graph'):

pypy/translator/c/test/test_dlltool.py

         d = DLLDef('lib', [(f, [int]), (b, [int])])
         so = d.compile()
         dirpath = py.path.local(so).dirpath()
-        assert dirpath.join('translator_c_test_test_dlltool.c').check()
+        assert dirpath.join('pypy_translator_c_test_test_dlltool.c').check()

pypy/translator/c/test/test_standalone.py

 
         # Verify that the generated C files have sane names:
         gen_c_files = [str(f) for f in cbuilder.extrafiles]
-        for expfile in ('rlib_rposix.c', 
-                        'rpython_lltypesystem_rstr.c',
-                        'translator_c_test_test_standalone.c'):
+        for expfile in ('pypy_rlib_rposix.c',
+                        'pypy_rpython_lltypesystem_rstr.c',
+                        'pypy_translator_c_test_test_standalone.c'):
             assert cbuilder.targetdir.join(expfile) in gen_c_files
 
     def test_print(self):