Permalink
Browse files

Merge branch 'master' of github.com:joewalnes/raspberry-play

  • Loading branch information...
2 parents 096a6fd + 01fba57 commit ca3beaee4657b442bce2bad9d62f2bb70509461f Joe Walnes committed Oct 23, 2012
Showing with 9 additions and 9 deletions.
  1. +3 −3 lib/quick2web/__init__.py
  2. +1 −1 lib/quick2web/sharedvalue.py
  3. +3 −3 lib/quick2web/tornadowebserver.py
  4. +2 −2 web-slider/main.py
@@ -1,6 +1,6 @@
-import sharedvalue
-import tornadowebserver
-import webserver
+import quick2web.sharedvalue
+import quick2web.tornadowebserver
+import quick2web.webserver
# Map to default implementation
WebServer = tornadowebserver.TornadoWebServer
@@ -1,6 +1,6 @@
import json
-from webserver import WebSocketHandler
+from quick2web.webserver import WebSocketHandler
class SharedValue(WebSocketHandler):
@@ -1,12 +1,12 @@
import os
-import webserver
+import quick2web.webserver
from socket import gethostname
from tornado import websocket
from tornado.ioloop import IOLoop
from tornado.web import Application, StaticFileHandler
-class TornadoWebServer(webserver.WebServer):
+class TornadoWebServer(quick2web.webserver.WebServer):
def __init__(self,
port,
@@ -60,7 +60,7 @@ def allow_draft76(self):
# Support older WebSocket protocol versions.
return True
-class TornadoWebSocketConnection(webserver.WebSocketConnection):
+class TornadoWebSocketConnection(quick2web.webserver.WebSocketConnection):
def __init__(self, tornado_handler):
self.tornado_handler = tornado_handler
View
@@ -7,12 +7,12 @@ def main():
SharedValue(20, on_change=slider_updated))
webserver.static_files('/', './static')
- print 'Listening on %s' % webserver.url
+ print('Listening on %s' % webserver.url)
webserver.run()
def slider_updated(value, connection):
# TODO: Communicate with LED bar graph
- print 'Slider value: ', value
+ print('Slider value: ', value)
if __name__ == '__main__':
main()

0 comments on commit ca3beae

Please sign in to comment.