Author: Martin Matusiak <numero...@gmail.com>
Branch: py3.3-fixes2
Changeset: r72832:50ea833f79dd
Date: 2014-08-16 06:57 +0200
http://bitbucket.org/pypy/pypy/changeset/50ea833f79dd/
Log: prefer oefmt over OperationError
diff --git a/pypy/module/bz2/interp_bz2.py b/pypy/module/bz2/interp_bz2.py
--- a/pypy/module/bz2/interp_bz2.py
+++ b/pypy/module/bz2/interp_bz2.py
@@ -2,7 +2,7 @@
from rpython.rtyper.tool import rffi_platform as platform
from rpython.rtyper.lltypesystem import rffi
from rpython.rtyper.lltypesystem import lltype
-from pypy.interpreter.error import OperationError
+from pypy.interpreter.error import OperationError, oefmt
from pypy.interpreter.baseobjspace import W_Root
from pypy.interpreter.typedef import TypeDef, interp_attrproperty_bytes
from pypy.interpreter.typedef import GetSetProperty
@@ -269,8 +269,7 @@
lltype.free(self.bzs, flavor='raw')
def __getstate__(self):
- raise OperationError(self.space.w_TypeError,
- self.space.wrap("cannot serialize '_bz2.BZ2Compressor' object"))
+ raise oefmt(self.space.w_TypeError, "cannot serialize '%T' object",
self)
@unwrap_spec(data='bufferstr')
def compress(self, data):
@@ -378,8 +377,7 @@
lltype.free(self.bzs, flavor='raw')
def __getstate__(self):
- raise OperationError(self.space.w_TypeError,
- self.space.wrap("cannot serialize '_bz2.BZ2Decompressor' object"))
+ raise oefmt(self.space.w_TypeError, "cannot serialize '%T' object",
self)
def eof_w(self, space):
if self.running:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
