[Python-checkins] r54664 - in python/trunk/Lib: copy_reg.py test/test_array.py test/test_descr.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Tue Apr  3 01:55:37 2007
New Revision: 54664

Modified:
   python/trunk/Lib/copy_reg.py
   python/trunk/Lib/test/test_array.py
   python/trunk/Lib/test/test_descr.py
Log:
Fix warnings about object.__init__() signature.
Two (test_array and test_descr) were bug IMO; the third (copy_reg)
is a work-around which recognizes that object.__init__() doesn't do
anything.


Modified: python/trunk/Lib/copy_reg.py
==============================================================================
--- python/trunk/Lib/copy_reg.py	(original)
+++ python/trunk/Lib/copy_reg.py	Tue Apr  3 01:55:37 2007
@@ -48,7 +48,8 @@
         obj = object.__new__(cls)
     else:
         obj = base.__new__(cls, state)
-        base.__init__(obj, state)
+        if base.__init__ != object.__init__:
+            base.__init__(obj, state)
     return obj
 
 _HEAPTYPE = 1<<9

Modified: python/trunk/Lib/test/test_array.py
==============================================================================
--- python/trunk/Lib/test/test_array.py	(original)
+++ python/trunk/Lib/test/test_array.py	Tue Apr  3 01:55:37 2007
@@ -728,7 +728,6 @@
                 return array.array.__new__(cls, 'c', s)
 
             def __init__(self, s, color='blue'):
-                array.array.__init__(self, 'c', s)
                 self.color = color
 
             def strip(self):

Modified: python/trunk/Lib/test/test_descr.py
==============================================================================
--- python/trunk/Lib/test/test_descr.py	(original)
+++ python/trunk/Lib/test/test_descr.py	Tue Apr  3 01:55:37 2007
@@ -2305,7 +2305,6 @@
         __slots__ = ['prec']
         def __init__(self, value=0.0, prec=12):
             self.prec = int(prec)
-            float.__init__(self, value)
         def __repr__(self):
             return "%.*g" % (self.prec, self)
     vereq(repr(precfloat(1.1)), "1.1")