diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-04 10:43:21 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-04 10:43:21 -0500 |
| commit | dcc7afcea31c968575446b7f215d6780f747d7fb (patch) | |
| tree | 52591d98be214371d96795f4995e637ce95d7759 /operationscore/SmootCoreObject.py | |
| parent | f5c29b39f3eef83227e3fb7c550d9b2922a19894 (diff) | |
| parent | 134de4472d3f2fa913944770595de9221dd27fdf (diff) | |
Merge branch 'bens-cleanup' of github.com:rcoh/SmootLight
Conflicts:
operationscore/Input.py
pixelevents/DecayEvent.py
util/ColorOps.py
Diffstat (limited to 'operationscore/SmootCoreObject.py')
| -rw-r--r-- | operationscore/SmootCoreObject.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/operationscore/SmootCoreObject.py b/operationscore/SmootCoreObject.py index 26b3fc2..291519a 100644 --- a/operationscore/SmootCoreObject.py +++ b/operationscore/SmootCoreObject.py @@ -2,12 +2,11 @@ import pdb import threading import thread import util.Config as configGetter -class SmootCoreObject(threading.Thread): +class SmootCoreObject(object): def __init__(self, argDict, skipValidation = False): self.argDict = argDict self.validateArgs(self.className()+'.params') self.lock = thread.allocate_lock() - threading.Thread.__init__(self) self.init() #call init of inheriting class # self.__setitem__ = self.argDict.__setitem__ # self.__getitem__ = self.argDict.__getitem__ |