[pypy-svn] r48902 - in pypy/dist/pypy: interpreter translator/cli/src

antocuni at codespeak.net antocuni at codespeak.net
Wed Nov 21 15:29:48 CET 2007


Author: antocuni
Date: Wed Nov 21 15:29:47 2007
New Revision: 48902

Modified:
   pypy/dist/pypy/interpreter/mixedmodule.py
   pypy/dist/pypy/translator/cli/src/ll_os.cs
Log:
don't use '*.py' as __file__ for mixed modules, because it hurt's
.NET's System.IO.GetFullPath.



Modified: pypy/dist/pypy/interpreter/mixedmodule.py
==============================================================================
--- pypy/dist/pypy/interpreter/mixedmodule.py	(original)
+++ pypy/dist/pypy/interpreter/mixedmodule.py	Wed Nov 21 15:29:47 2007
@@ -126,7 +126,7 @@
             assert os.path.basename(fname).startswith('__init__.py')
             # make it clear that it's not really the interp-level module
             # at this path that we are seeing, but an app-level version of it
-            fname = os.path.join(os.path.dirname(fname), '*.py')
+            fname = os.path.dirname(fname)
             cls._fname = fname 
         return space.wrap(fname) 
 

Modified: pypy/dist/pypy/translator/cli/src/ll_os.cs
==============================================================================
--- pypy/dist/pypy/translator/cli/src/ll_os.cs	(original)
+++ pypy/dist/pypy/translator/cli/src/ll_os.cs	Wed Nov 21 15:29:47 2007
@@ -524,6 +524,11 @@
         {
         }
 
+        public static string posix__getfullpathname(string path)
+        {
+            return System.IO.Path.GetFullPath(path);
+        }
+
         public static Record_Signed_Signed ll_os_pipe()
         {
             Helpers.raise_OSError(Errno.EPERM); // this is only a stub



More information about the Pypy-commit mailing list