Fix test failure on webob.static on Pypy

This should fix the error from http://lists.repoze.org/pipermail/pyramid-checkins/2012-April/003847.html
Pylons · Apr 12, 2012 · 7491657 · 7491657
1 parent b282e82
commit 7491657
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/tests/test_static.py b/tests/test_static.py
@@ -79,16 +79,12 @@ def open_oserror(*args, **kwargs):
             raise OSError()
 
         app = static.FileApp(self.tempfile)
-        old_open = __builtins__['open']
 
-        try:
+        app._open = open_ioerror
-            __builtins__['open'] = open_ioerror
+        self.assertEqual(403, get_response(app).status_int)
-            self.assertEqual(403, get_response(app).status_int)
 
-            __builtins__['open'] = open_oserror
+        app._open = open_oserror
-            self.assertEqual(403, get_response(app).status_int)
+        self.assertEqual(403, get_response(app).status_int)
-        finally:
-            __builtins__['open'] = old_open
 
 
 class TestFileIter(unittest.TestCase):

diff --git a/webob/static.py b/webob/static.py
@@ -27,6 +27,8 @@ def __init__(self, filename, **kw):
         kw.setdefault('content_encoding', content_encoding)
         kw.setdefault('accept_ranges', 'bytes')
         self.kw = kw
+        # Used for testing purpose
+        self._open = open
 
     @wsgify
     def __call__(self, req):
@@ -40,7 +42,7 @@ def __call__(self, req):
             return exc.HTTPNotFound(comment=msg)
 
         try:
-            file = open(self.filename, 'rb')
+            file = self._open(self.filename, 'rb')
         except (IOError, OSError) as e:
             msg = "You are not permitted to view this file (%s)" % e
             return exc.HTTPForbidden(msg)