Reorganize flask_uwsgi, update examples.

zeekay · zeekay · commit 433209b7a088 · 2014-01-21T15:29:27.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.egg-info
 *.pyc
+*.pyo
 dist/
diff --git a/examples/echo/echo.py b/examples/echo/echo.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 from flask import Flask, render_template
 from flask.ext.uwsgi_websocket import GeventWebSocket
 
@@ -12,4 +13,9 @@ def index():
 def echo(ws):
     while True:
         msg = ws.receive()
+        if not msg: return
         ws.send(msg)
+
+if __name__ == '__main__':
+    from os import system
+    system('uwsgi --http :8080 --http-websockets --master --gevent 100 -w echo:app')
diff --git a/flask_uwsgi_websocket/__init__.py b/flask_uwsgi_websocket/__init__.py
@@ -1,8 +1,8 @@
-"""
+'''
 Flask-uWSGI-WebSocket
--------------
+---------------------
 High-performance WebSockets for your Flask apps powered by `uWSGI <http://uwsgi-docs.readthedocs.org/en/latest/>`_.
-"""
+'''
 
 __docformat__ = 'restructuredtext'
 __version__ = '0.0.3'
@@ -11,11 +11,7 @@
 
 import sys
 from werkzeug.debug import DebuggedApplication
-
-try:
-    import uwsgi
-except ImportError:
-    pass
+from ._uwsgi import uwsgi
 
 
 class WebSocketClient(object):
@@ -91,12 +87,4 @@ def decorator(f):
     def add_url_rule(self, rule, _, f, **options):
         self.websocket_routes[rule] = f
 
-
-class GeventWebSocket(WebSocket):
-    def init_app(self, app):
-        from .gevent_websocket import GeventWebSocketMiddleware
-
-        if app.debug:
-            app.wsgi_app = DebuggedApplication(app.wsgi_app, True)
-
-        app.wsgi_app = GeventWebSocketMiddleware(app.wsgi_app, self)
+from ._gevent import *
diff --git a/flask_uwsgi_websocket/_gevent.py b/flask_uwsgi_websocket/_gevent.py
@@ -1,6 +1,6 @@
-from . import WebSocketClient, WebSocketMiddleware
+from . import WebSocket, WebSocketClient, WebSocketMiddleware
+from ._uwsgi import uwsgi
 import gevent.select
-import uwsgi
 
 
 class GeventWebSocketClient(WebSocketClient):
@@ -14,3 +14,11 @@ def receive(self):
 
 class GeventWebSocketMiddleware(WebSocketMiddleware):
     Client = GeventWebSocketClient
+
+
+class GeventWebSocket(WebSocket):
+    def init_app(self, app):
+        if app.debug:
+            app.wsgi_app = DebuggedApplication(app.wsgi_app, True)
+
+        app.wsgi_app = GeventWebSocketMiddleware(app.wsgi_app, self)
diff --git a/flask_uwsgi_websocket/_uwsgi.py b/flask_uwsgi_websocket/_uwsgi.py
@@ -0,0 +1,4 @@
+try:
+    import uwsgi
+except ImportError:
+    uwsgi = None

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 *.egg-info
 *.pyc
 +*.pyo
 dist/