joshua/websockify

Commit Graph

Author	SHA1	Message	Date
Solly Ross	acd276e1a2	Don't use implicit relative imports Implicit relative imports don't work in Python 3. This converts implicit relative imports into absolute imports (e.g. `import websocket` becomes `from websockify import websocket`). Fixes #154	2015-02-03 16:52:29 -05:00
Vishvananda Ishaya	880257a431	Import everything in websocketproxy and websocket Old users of the websockify library used websockify.WebSocketProxy The refactor into a module unneccessarily broke this import. The current imports in __init__.py don't actually do anything so this patch changes the import to import everything so that the old import still works. This appears to be the original intention of the existing import statements.	2012-09-25 22:24:10 -07:00
Joel Martin	c0d23e27e4	Refactor into python modules: websocket, websocketproxy Make websockify subdirectory and move websocket.py -> websockify/websocket.py and websockify -> websockify/websocketproxy.py. Create a ./run script that launches websockify as before (unfortunately can't have a websockify script at the same level since this is now a directory). Make websockify.py a symlink to ./run. Once the package is installed, the main launch script will be /usr/bin/websockify. This makes it easier to package up websockify as a python module. setup.py should now properly install websockify as a module. Note that to include the base websocket module/class you will now do: import websockify.websocket #OR from websockify.websocket import WebSocketServer To import the full websocket proxy functionality: import websockify.websocketproxy #OR from websockify.websocket import WebSocketProxy This will also help with startup speed slightly because the code in websocketproxy will now be byte compiled since it is no longer in the main invocation script.	2012-09-17 14:06:51 -05:00

Author

SHA1

Message

Date

Solly Ross

acd276e1a2

Don't use implicit relative imports

Implicit relative imports don't work in Python 3.  This converts
implicit relative imports into absolute imports
(e.g. `import websocket` becomes `from websockify import websocket`).

Fixes #154

2015-02-03 16:52:29 -05:00

Vishvananda Ishaya

880257a431

Import everything in websocketproxy and websocket

Old users of the websockify library used websockify.WebSocketProxy
The refactor into a module unneccessarily broke this import. The
current imports in __init__.py don't actually do anything so this
patch changes the import to import everything so that the old import
still works. This appears to be the original intention of the existing
import statements.

2012-09-25 22:24:10 -07:00

Joel Martin

c0d23e27e4

Refactor into python modules: websocket, websocketproxy

Make websockify subdirectory and move websocket.py ->
websockify/websocket.py and websockify ->
websockify/websocketproxy.py. Create a ./run script that launches
websockify as before (unfortunately can't have a websockify script at
the same level since this is now a directory). Make websockify.py
a symlink to ./run. Once the package is installed, the main launch
script will be /usr/bin/websockify.

This makes it easier to package up websockify as a python module.
setup.py should now properly install websockify as a module.

Note that to include the base websocket module/class you will now do:

    import websockify.websocket
    #OR
    from websockify.websocket import WebSocketServer

To import the full websocket proxy functionality:

    import websockify.websocketproxy
    #OR
    from websockify.websocket import WebSocketProxy

This will also help with startup speed slightly because the code in
websocketproxy will now be byte compiled since it is no longer in the
main invocation script.

2012-09-17 14:06:51 -05:00

3 Commits