Merge remote-tracking branch 'hansent/master' into develop

This commit is contained in:
Lance Stout 2012-03-20 11:50:57 -07:00
commit 1c83391948
2 changed files with 4 additions and 4 deletions

View file

@ -16,7 +16,7 @@ class Thermostat(Endpoint):
def FQN(self):
return 'thermostat'
def __init(self, initial_temperature):
def __init__(self, initial_temperature):
self._temperature = initial_temperature
self._event = threading.Event()
@ -50,4 +50,4 @@ def main():
if __name__ == '__main__':
main()

View file

@ -15,7 +15,7 @@ class Thermostat(Endpoint):
def FQN(self):
return 'thermostat'
def __init(self, initial_temperature):
def __init__(self, initial_temperature):
self._temperature = initial_temperature
self._event = threading.Event()
@ -49,4 +49,4 @@ def main():
if __name__ == '__main__':
main()