Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r61485:1c71ee0c15d8
Date: 2013-02-19 22:57 -0800
http://bitbucket.org/pypy/pypy/changeset/1c71ee0c15d8/
Log: kill tuple raising leftovers, cleanup docs
diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -164,26 +164,19 @@
#
# In the following table, 'Class' means a subclass of BaseException
# and 'inst' is an instance of either 'Class' or a subclass of it.
- # Or 'Class' can also be an old-style class and 'inst' an old-style
- # instance of it.
#
- # The flow object space only deals with non-advanced case. Old-style
- # classes and instances *are* advanced.
+ # The flow object space only deals with non-advanced case.
#
# input (w_type, w_value)... becomes... advanced case?
# ---------------------------------------------------------------------
- # (tuple, w_value) (tuple[0], w_value) yes
# (Class, None) (Class, Class()) no
# (Class, inst) (inst.__class__, inst) no
# (Class, tuple) (Class, Class(*tuple)) yes
# (Class, x) (Class, Class(x)) no
- # ("string", ...) ("string", ...) deprecated
# (inst, None) (inst.__class__, inst) no
#
w_type = self.w_type
w_value = self.get_w_value(space)
- while space.is_true(space.isinstance(w_type, space.w_tuple)):
- w_type = space.getitem(w_type, space.wrap(0))
if space.exception_is_valid_obj_as_class_w(w_type):
# this is for all cases of the form (Class, something)
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -1161,7 +1161,7 @@
"""Raised when exiting a frame via a 'yield' statement."""
class RaiseWithExplicitTraceback(Exception):
- """Raised at interp-level by a 0- or 3-arguments 'raise' statement."""
+ """Raised at interp-level by a 0-argument 'raise' statement."""
def __init__(self, operr):
self.operr = operr
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
