[pypy-commit] pypy py3.3: mmap.error is OSError

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.3
Changeset: r72342:4deadf46db89
Date: 2014-06-22 20:41 +0200
http://bitbucket.org/pypy/pypy/changeset/4deadf46db89/

Log:	mmap.error is OSError

diff --git a/pypy/module/mmap/__init__.py b/pypy/module/mmap/__init__.py
--- a/pypy/module/mmap/__init__.py
+++ b/pypy/module/mmap/__init__.py
@@ -8,7 +8,7 @@
         'ACCESS_WRITE': 'space.wrap(interp_mmap.ACCESS_WRITE)',
         'ACCESS_COPY' : 'space.wrap(interp_mmap.ACCESS_COPY)',
         'mmap': 'interp_mmap.W_MMap',
-        'error': 'space.fromcache(interp_mmap.Cache).w_error',
+        'error': 'space.w_OSError',
     }
 
     appleveldefs = {
diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -283,10 +283,6 @@
 ACCESS_WRITE = rmmap.ACCESS_WRITE
 ACCESS_COPY  = rmmap.ACCESS_COPY
 
-class Cache:
-    def __init__(self, space):
-        self.w_error = space.new_exception_class("mmap.error",
-                                                 space.w_EnvironmentError)
 
 def mmap_error(space, e):
     if isinstance(e, RValueError):
@@ -296,8 +292,7 @@
         return OperationError(space.w_TypeError,
                               space.wrap(e.message))
     elif isinstance(e, OSError):
-        w_error = space.fromcache(Cache).w_error
-        return wrap_oserror(space, e, w_exception_class=w_error)
+        return wrap_oserror(space, e)
     else:
         # bogus 'e'?
         return OperationError(space.w_SystemError, space.wrap('%s' % e))
diff --git a/pypy/module/mmap/test/test_mmap.py b/pypy/module/mmap/test/test_mmap.py
--- a/pypy/module/mmap/test/test_mmap.py
+++ b/pypy/module/mmap/test/test_mmap.py
@@ -31,9 +31,7 @@
             assert isinstance(mmap.PROT_READ, int)
             assert isinstance(mmap.PROT_WRITE, int)
 
-        assert 'mmap.error' in str(mmap.error)
-        assert mmap.error is not EnvironmentError
-        assert issubclass(mmap.error, EnvironmentError)
+        assert mmap.error is OSError
 
     def test_args(self):
         from mmap import mmap