Author: Alex Gaynor <alex.gay...@gmail.com>
Branch:
Changeset: r57442:2b5f298242ce
Date: 2012-09-20 10:43 -0700
http://bitbucket.org/pypy/pypy/changeset/2b5f298242ce/
Log: merged upstream
diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -21,8 +21,7 @@
_application_traceback = None
def __init__(self, w_type, w_value, tb=None):
- if not we_are_translated() and w_type is None:
- raise ValueError
+ assert w_type is not None
self.setup(w_type)
self._w_value = w_value
self._application_traceback = tb
@@ -326,8 +325,7 @@
self.xstrings = strings
for i, attr in entries:
setattr(self, attr, args[i])
- if not we_are_translated() and w_type is None:
- raise ValueError
+ assert w_type is not None
def _compute_value(self):
lst = [None] * (len(formats) + len(formats) + 1)
for i, attr in entries:
diff --git a/pypy/interpreter/test/test_syntax.py
b/pypy/interpreter/test/test_syntax.py
--- a/pypy/interpreter/test/test_syntax.py
+++ b/pypy/interpreter/test/test_syntax.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
import py
from pypy.conftest import gettestobjspace
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
