[pypy-commit] pypy default: misplaced comment

pjenvey pypy.commits at gmail.com
Tue Oct 25 00:45:05 EDT 2016


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: 
Changeset: r87925:2c5026ca3c15
Date: 2016-10-24 21:38 -0700
http://bitbucket.org/pypy/pypy/changeset/2c5026ca3c15/

Log:	misplaced comment

diff --git a/pypy/objspace/std/objectobject.py b/pypy/objspace/std/objectobject.py
--- a/pypy/objspace/std/objectobject.py
+++ b/pypy/objspace/std/objectobject.py
@@ -96,12 +96,12 @@
         w_parent_init, _ = space.lookup_in_type_where(w_type, '__init__')
         if (w_parent_new is not space.w_object and
             w_parent_init is not space.w_object):
+            # 2.7: warn about excess arguments when both methods are
+            # overridden
             space.warn(space.wrap("object() takes no parameters"),
                        space.w_DeprecationWarning, 1)
         elif (w_parent_new is not space.w_object or
               w_parent_init is space.w_object):
-            # 2.7: warn about excess arguments when both methods are
-            # overridden
             raise oefmt(space.w_TypeError,
                         "object() takes no parameters")
     if w_type.is_abstract():


More information about the pypy-commit mailing list