[pypy-commit] pypy py3.5: hg merge default]

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r87940:c35d8da07409
Date: 2016-10-26 16:24 +0100
http://bitbucket.org/pypy/pypy/changeset/c35d8da07409/

Log:	hg merge default]

diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -84,11 +84,8 @@
             exc_value = str(w_value)
         else:
             w = space.wrap
-            if space.is_w(space.type(self.w_type), space.w_text):
-                exc_typename = space.str_w(self.w_type)
-            else:
-                exc_typename = space.str_w(
-                    space.getattr(self.w_type, w('__name__')))
+            exc_typename = space.str_w(
+                space.getattr(self.w_type, w('__name__')))
             if space.is_w(w_value, space.w_None):
                 exc_value = ""
             else:
diff --git a/pypy/interpreter/function.py b/pypy/interpreter/function.py
--- a/pypy/interpreter/function.py
+++ b/pypy/interpreter/function.py
@@ -604,7 +604,7 @@
 
 class StaticMethod(W_Root):
     """The staticmethod objects."""
-    _immutable_fields_ = ['w_function']
+    _immutable_fields_ = ['w_function?']
 
     def __init__(self, w_function):
         self.w_function = w_function
@@ -640,7 +640,7 @@
 
 class ClassMethod(W_Root):
     """The classmethod objects."""
-    _immutable_fields_ = ['w_function']
+    _immutable_fields_ = ['w_function?']
 
     def __init__(self, w_function):
         self.w_function = w_function
diff --git a/pypy/module/__builtin__/test/test_descriptor.py b/pypy/module/__builtin__/test/test_descriptor.py
--- a/pypy/module/__builtin__/test/test_descriptor.py
+++ b/pypy/module/__builtin__/test/test_descriptor.py
@@ -33,7 +33,7 @@
 
         class C(Static):
             def __init__(self, callable):
-                super().__init__(callable)
+                super(C, self).__init__(callable)
         y = C(1)
         assert isinstance(y, C)
 
@@ -60,7 +60,7 @@
 
         class C(Classm):
             def __init__(self, callable):
-                super().__init__(callable)
+                super(C, self).__init__(callable)
         y = C(1)
         assert isinstance(y, C)