[pypy-commit] pypy default: refactor

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: 
Changeset: r84166:6479edc9c369
Date: 2016-05-02 19:58 -0700
http://bitbucket.org/pypy/pypy/changeset/6479edc9c369/

Log:	refactor

diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_codecs.py
--- a/pypy/module/_codecs/interp_codecs.py
+++ b/pypy/module/_codecs/interp_codecs.py
@@ -51,13 +51,10 @@
                 or not space.isinstance_w(
                                  space.getitem(w_res, space.wrap(0)),
                                  space.w_unicode)):
-                if decode:
-                    msg = ("decoding error handler must return "
-                           "(unicode, int) tuple, not %R")
-                else:
-                    msg = ("encoding error handler must return "
-                           "(unicode, int) tuple, not %R")
-                raise oefmt(space.w_TypeError, msg, w_res)
+                raise oefmt(space.w_TypeError,
+                            "%s error handler must return (unicode, int) "
+                            "tuple, not %R",
+                            "decoding" if decode else "encoding", w_res)
             w_replace, w_newpos = space.fixedview(w_res, 2)
             newpos = space.int_w(w_newpos)
             if newpos < 0: