summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-03-20 11:50:57 -0700
committerLance Stout <lancestout@gmail.com>2012-03-20 11:50:57 -0700
commit1c83391948a04858c9a2d61deb5a838487e7f022 (patch)
tree2b4a840dac39174a20582d5d354074a77f7941fb
parent59d1b8e1312387732e94aa5d06f7668d2865a211 (diff)
parent5a4df56836e0b974564e321c76f72d0a59cae6b0 (diff)
downloadslixmpp-1c83391948a04858c9a2d61deb5a838487e7f022.tar.gz
slixmpp-1c83391948a04858c9a2d61deb5a838487e7f022.tar.bz2
slixmpp-1c83391948a04858c9a2d61deb5a838487e7f022.tar.xz
slixmpp-1c83391948a04858c9a2d61deb5a838487e7f022.zip
Merge remote-tracking branch 'hansent/master' into develop
-rw-r--r--examples/rpc_client_side.py4
-rw-r--r--examples/rpc_server_side.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/rpc_client_side.py b/examples/rpc_client_side.py
index ca1084f0..135d6237 100644
--- a/examples/rpc_client_side.py
+++ b/examples/rpc_client_side.py
@@ -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()
- \ No newline at end of file
+
diff --git a/examples/rpc_server_side.py b/examples/rpc_server_side.py
index 0af8af43..d1a11c17 100644
--- a/examples/rpc_server_side.py
+++ b/examples/rpc_server_side.py
@@ -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()
- \ No newline at end of file
+