Author: David Schneider <[email protected]>
Branch: disable_merge_different_int_types
Changeset: r49917:61b011382aef
Date: 2011-11-28 16:57 +0100
http://bitbucket.org/pypy/pypy/changeset/61b011382aef/
Log: (arigo, bivab) get rid of the last traces of ROverflowError
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
@@ -3,7 +3,7 @@
from pypy.interpreter.typedef import TypeDef
from pypy.interpreter.gateway import interp2app, unwrap_spec, NoneNotWrapped
from pypy.rlib import rmmap
-from pypy.rlib.rmmap import RValueError, RTypeError, ROverflowError
+from pypy.rlib.rmmap import RValueError, RTypeError
class W_MMap(Wrappable):
@@ -212,8 +212,6 @@
raise OperationError(space.w_ValueError, space.wrap(e.message))
except RTypeError, e:
raise OperationError(space.w_TypeError, space.wrap(e.message))
- except ROverflowError, e:
- raise OperationError(space.w_OverflowError, space.wrap(e.message))
return space.wrap(self)
elif rmmap._MS_WINDOWS:
@@ -233,8 +231,6 @@
raise OperationError(space.w_ValueError, space.wrap(e.message))
except RTypeError, e:
raise OperationError(space.w_TypeError, space.wrap(e.message))
- except ROverflowError, e:
- raise OperationError(space.w_OverflowError, space.wrap(e.message))
return space.wrap(self)
W_MMap.typedef = TypeDef("mmap",
diff --git a/pypy/rlib/rmmap.py b/pypy/rlib/rmmap.py
--- a/pypy/rlib/rmmap.py
+++ b/pypy/rlib/rmmap.py
@@ -23,10 +23,6 @@
def __init__(self, message):
self.message = message
-class ROverflowError(Exception):
- def __init__(self, message):
- self.message = message
-
includes = ["sys/types.h"]
if _POSIX:
includes += ['unistd.h', 'sys/mman.h']
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
