Merge branch 'bens-cleanup' of github.com:rcoh/SmootLight

Conflicts:
	operationscore/Input.py
	pixelevents/DecayEvent.py
	util/ColorOps.py

1 files changed, 2 insertions, 2 deletions

diff --git a/operationscore/Input.py b/operationscore/Input.py
index 9e8841a..3dd74cf 100644
--- a/operationscore/Input.py
+++ b/operationscore/Input.py
@@ -1,6 +1,6 @@
 import threading,time
-from operationscore.SmootCoreObject import *
 from logger import main_log, exception_log
+from operationscore.ThreadedSmootCoreObject import ThreadedSmootCoreObject
 #Abstract class for inputs.  Inheriting classes should call "respond" to raise
 #their event.  Inheriting classes MUST define sensingLoop.  Called at the
 #interval specified in RefreshInterval while the input is active.  For example, if you are writing
@@ -8,7 +8,7 @@ from logger import main_log, exception_log
 #Inheriting classes MAY define inputInit.  This is called before the loop
 #begins.
 import pdb
-class Input(SmootCoreObject):
+class Input(ThreadedSmootCoreObject):
     #Event scope is a function pointer the function that will get called when
     #an Parent is raised.
     def __init__(self, argDict):