summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #233 from JustAMan/masterliris2016-02-041-1/+4
|\ | | | | Handle more built-in exceptions that are not derived from Exception
| * Propagate SystemExit exception furtherVasily2016-01-181-0/+3
| |
| * Handle more built-in exceptions that are not derived from Exception in ↵Vasily2016-01-151-1/+1
| | | | | | | | WebSocketApp.run_forever()
* | Merge pull request #232 from anshulguleria/syntax-highlightingliris2016-02-041-11/+22
|\ \ | |/ |/| Adds python syntax highlighting to the python sample code in readme
| * Adds python syntax highlighting to the python sample code in readmeanshulguleria2016-01-101-11/+22
|/
* fixed #227liris2016-01-042-3/+6
|
* add ChangeLogliris2016-01-041-0/+1
|
* Merge branch 'ilysym-init-with-socket'liris2016-01-042-2/+9
|\
| * Merge branch 'init-with-socket' of ↵liris2016-01-042-2/+9
| |\ |/ / | | | | https://github.com/ilysym/websocket-client into ilysym-init-with-socket
| * Use pre-initialized stream socketIlya Semyonov2015-12-082-2/+9
| | | | | | | | | | Allow creating WebSocket connection on existing stream socket instance (either TCP or SSL).
* | add ChangeLogliris2016-01-041-1/+3
| |
* | Merge branch 'CptPicard-fix-nonstring-exception-message-bug'liris2016-01-041-1/+1
|\ \
| * \ Merge branch 'fix-nonstring-exception-message-bug' of ↵liris2016-01-041-1/+1
| |\ \ |/ / / | | | | | | https://github.com/CptPicard/websocket-client into CptPicard-fix-nonstring-exception-message-bug
| * | Not all exception messages are actually strings. For example SSLException ↵Eero Nevalainen2015-12-031-1/+1
| |/ | | | | | | seems to return just an integer error code from extract_err_message.
* | Merge branch 'oklahomer-fix_argspec'liris2016-01-041-2/+6
|\ \
| * \ Merge branch 'fix_argspec' of https://github.com/oklahomer/websocket-client ↵liris2016-01-041-2/+6
| |\ \ |/ / / | | | | | | into oklahomer-fix_argspec
| * | use inspect.getfullargspec with Python 3.xOklahomer2015-11-081-2/+6
| |/
* | Merge branch 'master' of https://github.com/liris/websocket-clientliris2016-01-0411-51/+51
|\ \
| * \ Merge pull request #231 from jwilk/spellingliris2016-01-0411-51/+51
| |\ \ | | |/ | |/| Fix typos
| | * fix typosJakub Wilk2016-01-0311-51/+51
| |/
* | new versionliris2016-01-042-2/+2
| |
* | add document for #217liris2016-01-041-0/+2
| |
* | Merge branch 'aholen-master'liris2016-01-041-1/+7
|\ \ | |/ |/|
| * Prints timings in consoleAndreas Holen2015-11-051-1/+7
|/
* fixed #215v0.34.0liris2015-10-282-5/+9
|
* fixed #203liris2015-10-282-3/+3
|
* start v0.34liris2015-10-283-2/+6
|
* Merge branch 'master' of https://github.com/liris/websocket-clientv0.33.0liris2015-10-271-2/+2
|\
| * Merge pull request #214 from jayvdb/py26-unindexed-parametersliris2015-10-271-2/+2
| |\ | | | | | | Python 2.6 str.format does not support unindexed parameters
| | * Python 2.6 str.format does not support unindexed parametersJohn Vandenberg2015-10-191-2/+2
| | |
* | | python 2.6 supportliris2015-10-271-1/+6
|/ /
* | refs #212liris2015-10-271-0/+1
| |
* | Merge branch 'nlevitt-tweaks'liris2015-10-271-1/+1
|\ \
| * \ Merge branch 'tweaks' of https://github.com/nlevitt/websocket-client into ↵liris2015-10-271-1/+1
| |\ \ |/ / / | | | | | | nlevitt-tweaks
| * | Merge remote-tracking branch 'origin/master' into tweaksNoah Levitt2015-09-237-8/+44
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: fixed #192 introduced close timeout fixed #199 WebSocketBadStatusException for handshake error fixed #198 introduce on_data callback to pass data type. documentation add space. Typo fix in README.rst Fix string formatting in exception add support for ssl cert chains to support client certs
| * | improve logging of error from callbackNoah Levitt2015-07-201-1/+1
| | |
* | | refs #211, #209, #210liris2015-10-271-0/+2
| | |
* | | Merge pull request #211 from obi1kenobi/masterliris2015-10-273-7/+12
|\ \ \ | | | | | | | | Security improvements during handshake
| * | | Ignoring files created during test cycle.Predrag Gruevski2015-09-211-0/+3
| | | |
| * | | Using os.urandom() and constant-time hash check for handshake. Fixes #209 #210Predrag Gruevski2015-09-212-7/+9
| | |/ | |/|
* | | refs #207liris2015-10-271-1/+1
| | |
* | | Merge branch 'robviaas-master'liris2015-10-271-0/+6
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/robviaas/websocket-client into ↵liris2015-10-271-0/+6
| |\ \ \ |/ / / / | | | | | | | | robviaas-master
| * | | Fix issue #207, Client certificates do not work with 2.7.9+ and 3.2+robviaas2015-09-201-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | (https://github.com/liris/websocket-client/issues/207) By observing the certfile argument, we can load the cert chain using the certfile, keyfile and password sslopt values. A more complete fix might allow us to pass in the SSLContext (rather than creating it on each connection), which would allow the caller to set all SSL options prior to calling create_connection() - this option was passed over as it required more extensive changes.
* | | ref #204liris2015-10-272-2/+3
| | | | | | | | | | | | update document
* | | Merge pull request #204 from DenisKolodin/patch-1liris2015-10-271-2/+5
|\ \ \ | | | | | | | | Map dict to headers list
| * | | Map dict to headers listDenisKolodin2015-08-221-2/+5
| |/ /
* | | Merge pull request #201 from hhatto/fix-invalid-rst-for-pypiliris2015-10-271-1/+1
|\ \ \ | |/ / |/| | rst invalid rendering on pypi
| * | rst invalid rendering on pypihhatto2015-08-121-1/+1
|/ /
* | fixed #192liris2015-07-302-4/+8
| | | | | | | | introduced close timeout