[pypy-svn] r17294 - pypy/dist/pypy/annotation

[arigo at codespeak.net]

Author: arigo
Date: Tue Sep  6 17:12:32 2005
New Revision: 17294

Modified:
   pypy/dist/pypy/annotation/model.py
Log:
Removed a few lines that were apparently accidentally checked in,
in rev 12254, along with a block of comments.


Modified: pypy/dist/pypy/annotation/model.py
==============================================================================
--- pypy/dist/pypy/annotation/model.py	(original)
+++ pypy/dist/pypy/annotation/model.py	Tue Sep  6 17:12:32 2005
@@ -34,7 +34,7 @@
 from pypy.objspace.flow.model import Constant
 from pypy.tool.tls import tlsobject
 import inspect
-import copy
+
 
 DEBUG = True    # set to False to disable recording of debugging information
 TLS = tlsobject()
@@ -119,7 +119,6 @@
     def __new__(cls, *args, **kw):
         self = super(SomeObject, cls).__new__(cls, *args, **kw)
         if DEBUG:
-            so = SomeObject
             try:
                 bookkeeper = pypy.annotation.bookkeeper.getbookkeeper()
                 position_key = bookkeeper.position_key
@@ -143,9 +142,6 @@
     caused_by_merge = property(caused_by_merge, set_caused_by_merge)
     del set_caused_by_merge
 
-    def __setattr__(self, key, value):
-        object.__setattr__(self, key, value)
-
     def can_be_none(self):
         return True