Fix a bunch of error in Python Scripts

[smartthings-infrastructure.git] / Extractor / ExtractorScript.py

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index e3947bcea00246461b50bb5e39ce58c72eafc579..e2aa123d4156d26d9e74655806aa51fae2e0b111 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -351,7 +351,7 @@ def CountEvents():
        #print "DEBUG: eventlist: %d" % len(eventList)
        #print "DEBUG: eventlist: %s" % eventList
        for event in eventList:
-               print "DEBUG: Event: %s %d" % (event, eventTypeCounterMap[event])
+               print("DEBUG: Event: %s %d" % (event, eventTypeCounterMap[event]))
                numOfActualEvents = numOfActualEvents + eventTypeCounterMap[event]
        return numOfActualEvents
 
@@ -521,9 +521,8 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "motion":
-                        print("HERE????")
                        #Write two events subsequently
-                       event = open("eventSimulator/motionActiveEvent.groovy", "r")                    
+                       event = open("eventSimulator/motionActiveEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
@@ -722,8 +721,6 @@ def ExtractEvents(extractedEvents):
                                eventVarCounterMap[eventList[i]] = eventVarCount + 1
                        capability = capabilityMap[variable[eventVarCount]]
                        #Write two events subsequently
-                        print("//////////////////////")
-                        print(capability)
                        if capability == "capability.switch":
                                event = open("eventSimulator/switchOnEvent.groovy", "r")
                        elif capability == "capability.switchLevel":
@@ -998,8 +995,8 @@ def ExtractEvents(extractedEvents):
                                event = open("eventSimulator/switchLevelEvent.groovy", "r")
                        elif capability == "capability.colorControl":
                                event = open("eventSimulator/colorLevelChangeEvent.groovy", "r")
-                        elif capability == "capability.switch":
-                                event = open("eventSimulator/switchLevelChangeEvent.groovy", "r")
+                       elif capability == "capability.switch":
+                               event = open("eventSimulator/switchLevelChangeEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
@@ -1069,11 +1066,11 @@ def ExtractEvents(extractedEvents):
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-                elif eventList[i] == "threeAxis":
-                        event = open("eventSimulator/threeAxisChangeEvent.groovy", "r")
-                        for line in event:
-                                extractedEvents.write(line)
-                        event.close()
+               elif eventList[i] == "threeAxis":
+                       event = open("eventSimulator/threeAxisChangeEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
                elif eventList[i] == "carbonDioxide":
                        event = open("eventSimulator/carbonDioxideEvent.groovy", "r")
                        for line in event: