[pypy-svn] r15051 - in pypy/dist/pypy/rpython/module: . test

cfbolz at codespeak.net cfbolz at codespeak.net
Mon Jul 25 18:38:32 CEST 2005


Author: cfbolz
Date: Mon Jul 25 18:38:32 2005
New Revision: 15051

Added:
   pypy/dist/pypy/rpython/module/support.py
   pypy/dist/pypy/rpython/module/test/test_ll_os_path.py
Modified:
   pypy/dist/pypy/rpython/module/ll_os.py
   pypy/dist/pypy/rpython/module/ll_os_path.py
Log:
(pedronis, cfbolz):
  - added tests for os.path.exists
  - moved some functions to rpython/module/support


Modified: pypy/dist/pypy/rpython/module/ll_os.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_os.py	(original)
+++ pypy/dist/pypy/rpython/module/ll_os.py	Mon Jul 25 18:38:32 2005
@@ -17,23 +17,9 @@
 from pypy.rpython.rstr import STR
 from pypy.rpython.lltype import GcStruct, Signed, Array, Char, Ptr, malloc
 
-# utility conversion functions
-def to_rstr(s):
-    p = malloc(STR, len(s))
-    for i in range(len(s)):
-        p.chars[i] = s[i]
-    return p
-
-def from_rstr(rs):
-    return ''.join([rs.chars[i] for i in range(len(rs.chars))])
-
-def ll_strcpy(dstchars, srcchars, n):
-    i = 0
-    while i < n:
-        dstchars[i] = srcchars[i]
-        i += 1
 
-# ____________________________________________________________
+from pypy.rpython.module.support import to_rstr, from_rstr, ll_strcpy
+
 
 def ll_os_open(fname, flag, mode):
     return os.open(from_rstr(fname), flag, mode)

Modified: pypy/dist/pypy/rpython/module/ll_os_path.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_os_path.py	(original)
+++ pypy/dist/pypy/rpython/module/ll_os_path.py	Mon Jul 25 18:38:32 2005
@@ -7,6 +7,7 @@
 import os
 from pypy.rpython.rstr import STR
 from pypy.rpython.module.ll_os import from_rstr
+from pypy.rpython.module.support import to_rstr, from_rstr, ll_strcpy
 
 
 # Does a path exist?
@@ -16,6 +17,6 @@
     """Test whether a path exists"""
     try:
         st = os.stat(from_rstr(path))
-    except os.error:
+    except OSError:
         return False
     return True

Added: pypy/dist/pypy/rpython/module/support.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/rpython/module/support.py	Mon Jul 25 18:38:32 2005
@@ -0,0 +1,19 @@
+from pypy.rpython.rstr import STR
+from pypy.rpython.lltype import GcStruct, Signed, Array, Char, Ptr, malloc
+
+
+# utility conversion functions
+def to_rstr(s):
+    p = malloc(STR, len(s))
+    for i in range(len(s)):
+        p.chars[i] = s[i]
+    return p
+
+def from_rstr(rs):
+    return ''.join([rs.chars[i] for i in range(len(rs.chars))])
+
+def ll_strcpy(dstchars, srcchars, n):
+    i = 0
+    while i < n:
+        dstchars[i] = srcchars[i]
+        i += 1

Added: pypy/dist/pypy/rpython/module/test/test_ll_os_path.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/rpython/module/test/test_ll_os_path.py	Mon Jul 25 18:38:32 2005
@@ -0,0 +1,12 @@
+import py
+
+import os
+
+from pypy.rpython.module.ll_os_path import *
+from pypy.rpython.module.support import to_rstr, from_rstr, ll_strcpy
+
+def test_exists():
+    filename = to_rstr(str(py.magic.autopath()))
+    assert ll_os_path_exists(filename) == True
+    assert not ll_os_path_exists(to_rstr(
+        "strange_filename_that_looks_improbable.sde"))



More information about the Pypy-commit mailing list