diff --git a/.travis.yml b/.travis.yml index 183cb69f..3f9b571c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,29 +10,29 @@ env: - TOX_ENV=py27-tw121 - TOX_ENV=py27-tw132 - TOX_ENV=py27-tw154 - - TOX_ENV=py27-tw162 + - TOX_ENV=py27-tw165 - TOX_ENV=py27-twtrunk - TOX_ENV=py27-asyncio - TOX_ENV=pypy-tw121 - TOX_ENV=pypy-tw132 - TOX_ENV=pypy-tw154 - - TOX_ENV=pypy-tw162 + - TOX_ENV=pypy-tw165 - TOX_ENV=pypy-twtrunk - TOX_ENV=pypy-asyncio - TOX_ENV=py33-tw154 - - TOX_ENV=py33-tw162 + - TOX_ENV=py33-tw165 - TOX_ENV=py33-twtrunk - TOX_ENV=py33-asyncio - TOX_ENV=py34-tw154 - - TOX_ENV=py34-tw162 + - TOX_ENV=py34-tw165 - TOX_ENV=py34-twtrunk - TOX_ENV=py34-asyncio #- TOX_ENV=py35-tw154 - #- TOX_ENV=py35-tw162 + #- TOX_ENV=py35-tw165 #- TOX_ENV=py35-twtrunk #- TOX_ENV=py35-asyncio @@ -53,7 +53,7 @@ matrix: - python: 3.5 env: - - TOX_ENV=py35-tw162 + - TOX_ENV=py35-tw165 - python: 3.5 env: diff --git a/DEVELOPERS.md b/DEVELOPERS.md index 6e240760..1e839ede 100644 --- a/DEVELOPERS.md +++ b/DEVELOPERS.md @@ -200,8 +200,6 @@ cd doc make publish ``` -> The docs are published to the Autobahn Web site, which is hosted on a AWS S3 bucket is owned by Tavendo, and hence the publish can only be done by Tavendo. - ### WebSocket Test Reports [AutobahnTestsuite](http://crossbar.io/autobahn#testsuite) provides a fully automated test suite to verify client and server implementations of the WebSocket Protocol for specification conformance and implementation robustness. @@ -308,8 +306,6 @@ aws --region eu-west-1 s3 sync \ --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers ``` -> The above S3 bucket is owned by Tavendo, and hence the upload can only be done by Tavendo. - After the upload has finished, check the live pages: * [Client Mode Reports](http://autobahn-python.readthedocs.io/en/latest/testreport/clients/index.html) diff --git a/LICENSE b/LICENSE index 99e2fed3..98b5b346 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) Tavendo GmbH +Copyright (c) Crossbar.io Technologies GmbH Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index bc1aa898..7d78994b 100755 --- a/Makefile +++ b/Makefile @@ -133,6 +133,3 @@ find_windows_files: # on Windows (Git Bash), check for files with Unix lines endings find_unix_files: find . -name "*" -exec dos2unix -tv {} \; 2>&1 | grep "Unix" - -find_tavendo: - find . -path ./.git -prune -o -type f -exec grep -Hi "tavendo" {} \; | grep -v "Copyright (c) Tavendo" diff --git a/README.rst b/README.rst index b9b34296..fd96c261 100644 --- a/README.rst +++ b/README.rst @@ -3,7 +3,7 @@ Autobahn\|Python WebSocket & WAMP for Python on Twisted and asyncio. -| |Version| |Downloads| |Build Status| |Coverage| |Docs| +| |Version| |Build Status| |Coverage| |Docs| -------------- @@ -128,12 +128,6 @@ Above code will work on Twisted and asyncio by changing a single line .. |Version| image:: https://img.shields.io/pypi/v/autobahn.svg :target: https://pypi.python.org/pypi/autobahn -.. |Downloads| image:: https://img.shields.io/pypi/dm/autobahn.svg - :target: https://pypi.python.org/pypi/autobahn - -.. |GitHub Stars| image:: https://img.shields.io/github/stars/crossbario/autobahn-python.svg?style=social&label=Star - :target: https://github.com/crossbario/autobahn-python - .. |Master Branch| image:: https://img.shields.io/badge/branch-master-orange.svg :target: https://travis-ci.org/crossbario/autobahn-python.svg?branch=master diff --git a/autobahn/__init__.py b/autobahn/__init__.py index bebe2b29..d186d94d 100644 --- a/autobahn/__init__.py +++ b/autobahn/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/_version.py b/autobahn/_version.py index 652da392..142d0539 100644 --- a/autobahn/_version.py +++ b/autobahn/_version.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -24,4 +24,4 @@ # ############################################################################### -__version__ = u'0.16.0' +__version__ = u'0.16.1' diff --git a/autobahn/asyncio/__init__.py b/autobahn/asyncio/__init__.py index 78d4107f..a35c6bb7 100644 --- a/autobahn/asyncio/__init__.py +++ b/autobahn/asyncio/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/asyncio/rawsocket.py b/autobahn/asyncio/rawsocket.py index 0e672944..4831fadb 100644 --- a/autobahn/asyncio/rawsocket.py +++ b/autobahn/asyncio/rawsocket.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/asyncio/util.py b/autobahn/asyncio/util.py index 19be5ce7..a95cf129 100644 --- a/autobahn/asyncio/util.py +++ b/autobahn/asyncio/util.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/asyncio/wamp.py b/autobahn/asyncio/wamp.py index 8e613299..dd8b9fc8 100644 --- a/autobahn/asyncio/wamp.py +++ b/autobahn/asyncio/wamp.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/asyncio/websocket.py b/autobahn/asyncio/websocket.py index bbfd9d88..f08ac6d9 100644 --- a/autobahn/asyncio/websocket.py +++ b/autobahn/asyncio/websocket.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/rawsocket/__init__.py b/autobahn/rawsocket/__init__.py index 8a4c67bf..89caae25 100644 --- a/autobahn/rawsocket/__init__.py +++ b/autobahn/rawsocket/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/rawsocket/test/__init__.py b/autobahn/rawsocket/test/__init__.py index 8a4c67bf..89caae25 100644 --- a/autobahn/rawsocket/test/__init__.py +++ b/autobahn/rawsocket/test/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/rawsocket/test/test_rawsocket_url.py b/autobahn/rawsocket/test/test_rawsocket_url.py index f0adc78a..a5f0edd1 100644 --- a/autobahn/rawsocket/test/test_rawsocket_url.py +++ b/autobahn/rawsocket/test/test_rawsocket_url.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/rawsocket/util.py b/autobahn/rawsocket/util.py index 66ecf8bd..3eee819d 100644 --- a/autobahn/rawsocket/util.py +++ b/autobahn/rawsocket/util.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/test/__init__.py b/autobahn/test/__init__.py index 82b625a7..4e690480 100644 --- a/autobahn/test/__init__.py +++ b/autobahn/test/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/test/test_util.py b/autobahn/test/test_util.py index ab2be7bc..2d859a59 100644 --- a/autobahn/test/test_util.py +++ b/autobahn/test/test_util.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/__init__.py b/autobahn/twisted/__init__.py index 5772de7a..80e24ad2 100644 --- a/autobahn/twisted/__init__.py +++ b/autobahn/twisted/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/choosereactor.py b/autobahn/twisted/choosereactor.py index 8238b227..87e3a7e7 100644 --- a/autobahn/twisted/choosereactor.py +++ b/autobahn/twisted/choosereactor.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/component.py b/autobahn/twisted/component.py index 111767df..9b86c2b4 100644 --- a/autobahn/twisted/component.py +++ b/autobahn/twisted/component.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/forwarder.py b/autobahn/twisted/forwarder.py index 3cac1112..fab716e8 100644 --- a/autobahn/twisted/forwarder.py +++ b/autobahn/twisted/forwarder.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/rawsocket.py b/autobahn/twisted/rawsocket.py index 6e40378c..dde7a15a 100644 --- a/autobahn/twisted/rawsocket.py +++ b/autobahn/twisted/rawsocket.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/resource.py b/autobahn/twisted/resource.py index cb3b7b23..fa6f72cc 100644 --- a/autobahn/twisted/resource.py +++ b/autobahn/twisted/resource.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/test/__init__.py b/autobahn/twisted/test/__init__.py index 8a4c67bf..89caae25 100644 --- a/autobahn/twisted/test/__init__.py +++ b/autobahn/twisted/test/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/test/test_application_runner.py b/autobahn/twisted/test/test_application_runner.py index 7a5f018c..c7408ed2 100644 --- a/autobahn/twisted/test/test_application_runner.py +++ b/autobahn/twisted/test/test_application_runner.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/test/test_choosereactor.py b/autobahn/twisted/test/test_choosereactor.py index 5e1282c3..3e8cb1c7 100644 --- a/autobahn/twisted/test/test_choosereactor.py +++ b/autobahn/twisted/test/test_choosereactor.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/test/test_endpoint_plugins.py b/autobahn/twisted/test/test_endpoint_plugins.py index c81bedd8..806ae6ee 100644 --- a/autobahn/twisted/test/test_endpoint_plugins.py +++ b/autobahn/twisted/test/test_endpoint_plugins.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/test/test_protocol.py b/autobahn/twisted/test/test_protocol.py index da50ebae..149e18ec 100644 --- a/autobahn/twisted/test/test_protocol.py +++ b/autobahn/twisted/test/test_protocol.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/test/test_rawsocket.py b/autobahn/twisted/test/test_rawsocket.py index efa61bf6..3e17de27 100644 --- a/autobahn/twisted/test/test_rawsocket.py +++ b/autobahn/twisted/test/test_rawsocket.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/util.py b/autobahn/twisted/util.py index 55461531..0b730474 100644 --- a/autobahn/twisted/util.py +++ b/autobahn/twisted/util.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/wamp.py b/autobahn/twisted/wamp.py index 36428833..e00035cc 100644 --- a/autobahn/twisted/wamp.py +++ b/autobahn/twisted/wamp.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/twisted/websocket.py b/autobahn/twisted/websocket.py index fdb3d243..6ab1b99c 100644 --- a/autobahn/twisted/websocket.py +++ b/autobahn/twisted/websocket.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/util.py b/autobahn/util.py index b190404f..9056a88a 100644 --- a/autobahn/util.py +++ b/autobahn/util.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/__init__.py b/autobahn/wamp/__init__.py index dd8748d2..92b051f0 100644 --- a/autobahn/wamp/__init__.py +++ b/autobahn/wamp/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/auth.py b/autobahn/wamp/auth.py index d003608f..1aee48e6 100644 --- a/autobahn/wamp/auth.py +++ b/autobahn/wamp/auth.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -289,8 +289,3 @@ def compute_wcs(key, challenge): challenge = challenge.encode('utf8') sig = hmac.new(key, challenge, hashlib.sha256).digest() return binascii.b2a_base64(sig).strip() - - -if __name__ == '__main__': - with open('test.svg', 'w') as f: - f.write(qrcode_from_totp(u'CACKN3GRF3KQZMEK', u'tobias1', u'Tavendo')) diff --git a/autobahn/wamp/component.py b/autobahn/wamp/component.py index c8380e65..f5e77b1e 100644 --- a/autobahn/wamp/component.py +++ b/autobahn/wamp/component.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/cryptobox.py b/autobahn/wamp/cryptobox.py index a9277b5a..7778c67a 100644 --- a/autobahn/wamp/cryptobox.py +++ b/autobahn/wamp/cryptobox.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/cryptosign.py b/autobahn/wamp/cryptosign.py index 64260882..465acf6a 100644 --- a/autobahn/wamp/cryptosign.py +++ b/autobahn/wamp/cryptosign.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/exception.py b/autobahn/wamp/exception.py index a95c5b03..d7d3a798 100644 --- a/autobahn/wamp/exception.py +++ b/autobahn/wamp/exception.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/interfaces.py b/autobahn/wamp/interfaces.py index db5a278f..2452f8f3 100644 --- a/autobahn/wamp/interfaces.py +++ b/autobahn/wamp/interfaces.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/message.py b/autobahn/wamp/message.py index b3fb4c40..495bfcb2 100644 --- a/autobahn/wamp/message.py +++ b/autobahn/wamp/message.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/protocol.py b/autobahn/wamp/protocol.py index 35b77fb5..6f8d8d48 100644 --- a/autobahn/wamp/protocol.py +++ b/autobahn/wamp/protocol.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/request.py b/autobahn/wamp/request.py index 3c7c8d87..2d1f51c6 100644 --- a/autobahn/wamp/request.py +++ b/autobahn/wamp/request.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/role.py b/autobahn/wamp/role.py index c4fae8ba..80caffc0 100644 --- a/autobahn/wamp/role.py +++ b/autobahn/wamp/role.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/serializer.py b/autobahn/wamp/serializer.py index 8515a24e..b7a48cf4 100644 --- a/autobahn/wamp/serializer.py +++ b/autobahn/wamp/serializer.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/__init__.py b/autobahn/wamp/test/__init__.py index 8a4c67bf..89caae25 100644 --- a/autobahn/wamp/test/__init__.py +++ b/autobahn/wamp/test/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_auth.py b/autobahn/wamp/test/test_auth.py index 6d47298b..97d7d5b0 100644 --- a/autobahn/wamp/test/test_auth.py +++ b/autobahn/wamp/test/test_auth.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_component.py b/autobahn/wamp/test/test_component.py index bef9f519..6e3616be 100644 --- a/autobahn/wamp/test/test_component.py +++ b/autobahn/wamp/test/test_component.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_exception.py b/autobahn/wamp/test/test_exception.py index 802248c7..75da1c20 100644 --- a/autobahn/wamp/test/test_exception.py +++ b/autobahn/wamp/test/test_exception.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_message.py b/autobahn/wamp/test/test_message.py index 3a5d283e..677be165 100644 --- a/autobahn/wamp/test/test_message.py +++ b/autobahn/wamp/test/test_message.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_protocol.py b/autobahn/wamp/test/test_protocol.py index ef97e578..37992434 100644 --- a/autobahn/wamp/test/test_protocol.py +++ b/autobahn/wamp/test/test_protocol.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_protocol_peer.py b/autobahn/wamp/test/test_protocol_peer.py index b074f8ad..ee207861 100644 --- a/autobahn/wamp/test/test_protocol_peer.py +++ b/autobahn/wamp/test/test_protocol_peer.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_runner.py b/autobahn/wamp/test/test_runner.py index ec5ca82c..2d5e4f48 100644 --- a/autobahn/wamp/test/test_runner.py +++ b/autobahn/wamp/test/test_runner.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_serializer.py b/autobahn/wamp/test/test_serializer.py index af87010e..212add9b 100644 --- a/autobahn/wamp/test/test_serializer.py +++ b/autobahn/wamp/test/test_serializer.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_uri_pattern.py b/autobahn/wamp/test/test_uri_pattern.py index f296954b..62601cd6 100644 --- a/autobahn/wamp/test/test_uri_pattern.py +++ b/autobahn/wamp/test/test_uri_pattern.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_user_handler_errors.py b/autobahn/wamp/test/test_user_handler_errors.py index e64ffb19..35570bad 100644 --- a/autobahn/wamp/test/test_user_handler_errors.py +++ b/autobahn/wamp/test/test_user_handler_errors.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/test/test_websocket.py b/autobahn/wamp/test/test_websocket.py index 32e45bfc..0a1ecfaf 100644 --- a/autobahn/wamp/test/test_websocket.py +++ b/autobahn/wamp/test/test_websocket.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/types.py b/autobahn/wamp/types.py index 17529a14..2bdb9111 100644 --- a/autobahn/wamp/types.py +++ b/autobahn/wamp/types.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/uri.py b/autobahn/wamp/uri.py index 18072994..c5889234 100644 --- a/autobahn/wamp/uri.py +++ b/autobahn/wamp/uri.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/wamp/websocket.py b/autobahn/wamp/websocket.py index 059c5e91..498c6829 100644 --- a/autobahn/wamp/websocket.py +++ b/autobahn/wamp/websocket.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/__init__.py b/autobahn/websocket/__init__.py index d9aec846..90d6418f 100644 --- a/autobahn/websocket/__init__.py +++ b/autobahn/websocket/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/compress.py b/autobahn/websocket/compress.py index 9cf79fb4..5a732c10 100644 --- a/autobahn/websocket/compress.py +++ b/autobahn/websocket/compress.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/compress_base.py b/autobahn/websocket/compress_base.py index dac85a6f..5402466f 100644 --- a/autobahn/websocket/compress_base.py +++ b/autobahn/websocket/compress_base.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/compress_bzip2.py b/autobahn/websocket/compress_bzip2.py index e47f3332..5b759235 100644 --- a/autobahn/websocket/compress_bzip2.py +++ b/autobahn/websocket/compress_bzip2.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/compress_deflate.py b/autobahn/websocket/compress_deflate.py index 20fd6d80..9ea1a9aa 100644 --- a/autobahn/websocket/compress_deflate.py +++ b/autobahn/websocket/compress_deflate.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/compress_snappy.py b/autobahn/websocket/compress_snappy.py index 53800c09..4416c523 100644 --- a/autobahn/websocket/compress_snappy.py +++ b/autobahn/websocket/compress_snappy.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/interfaces.py b/autobahn/websocket/interfaces.py index 7bcdada4..d569a0a0 100644 --- a/autobahn/websocket/interfaces.py +++ b/autobahn/websocket/interfaces.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/protocol.py b/autobahn/websocket/protocol.py index ec4eea83..addf4676 100755 --- a/autobahn/websocket/protocol.py +++ b/autobahn/websocket/protocol.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -783,15 +783,14 @@ class WebSocketProtocol(object): So we drop the connection, but set self.wasClean = False. """ self.serverConnectionDropTimeoutCall = None + if self.state != WebSocketProtocol.STATE_CLOSED: - self.log.debug("timeout: server did not drop TCP connection (in time)") self.wasClean = False - self.wasNotCleanReason = u'server did not drop TCP connection (in time)' + self.wasNotCleanReason = u'WebSocket closing handshake timeout (server did not drop TCP connection in time)' self.wasServerConnectionDropTimeout = True self.dropConnection(abort=True) else: - # ok, connection is already closed! - pass + self.log.debug("skipping closing handshake timeout: server did indeed drop the connection in time") def onOpenHandshakeTimeout(self): """ @@ -800,18 +799,16 @@ class WebSocketProtocol(object): So we drop the connection, but set self.wasClean = False. """ self.openHandshakeTimeoutCall = None + if self.state in [WebSocketProtocol.STATE_CONNECTING, WebSocketProtocol.STATE_PROXY_CONNECTING]: - self.log.debug("opening handshake timeout: peer did not finish (in time) the opening handshake") self.wasClean = False - self.wasNotCleanReason = u'peer did not finish (in time) the opening handshake' + self.wasNotCleanReason = u'WebSocket opening handshake timeout (peer did not finish the opening handshake in time)' self.wasOpenHandshakeTimeout = True self.dropConnection(abort=True) elif self.state == WebSocketProtocol.STATE_OPEN: self.log.debug("skipping opening handshake timeout: WebSocket connection is open (opening handshake already finished)") - elif self.state == WebSocketProtocol.STATE_CLOSING: self.log.debug("skipping opening handshake timeout: WebSocket connection is already closing ..") - elif self.state == WebSocketProtocol.STATE_CLOSED: self.log.debug("skipping opening handshake timeout: WebSocket connection is already closed") else: @@ -825,22 +822,22 @@ class WebSocketProtocol(object): So we drop the connection, but set self.wasClean = False. """ self.closeHandshakeTimeoutCall = None + if self.state != WebSocketProtocol.STATE_CLOSED: - self.log.debug("closing handshake timeout: peer did not finish (in time) the closing handshake") self.wasClean = False - self.wasNotCleanReason = u'peer did not respond (in time) in closing handshake' + self.wasNotCleanReason = u'WebSocket closing handshake timeout (peer did not finish the opening handshake in time)' self.wasCloseHandshakeTimeout = True self.dropConnection(abort=True) else: - self.log.debug("skipping closing handshake timeout: WebSocket connection is already closed") + self.log.debug('skipping closing handshake timeout: WebSocket connection is already closed') def onAutoPingTimeout(self): """ When doing automatic ping/pongs to detect broken connection, the peer did not reply in time to our ping. We drop the connection. """ - self.log.debug("Auto ping/pong: onAutoPingTimeout fired") - + self.wasClean = False + self.wasNotCleanReason = u'WebSocket ping timeout (peer did not respond with pong in time)' self.autoPingTimeoutCall = None self.dropConnection(abort=True) @@ -849,7 +846,12 @@ class WebSocketProtocol(object): Drop the underlying TCP connection. """ if self.state != WebSocketProtocol.STATE_CLOSED: - self.log.debug("dropping connection: {reason}", reason=self.wasNotCleanReason) + + if self.wasClean: + self.log.debug('dropping connection to peer {peer} with abort={abort}', peer=self.peer, abort=abort) + else: + self.log.warn('dropping connection to peer {peer} with abort={abort}: {reason}', peer=self.peer, abort=abort, reason=self.wasNotCleanReason) + self.droppedByMe = True # this code-path will be hit (*without* hitting @@ -860,7 +862,7 @@ class WebSocketProtocol(object): self._closeConnection(abort) else: - self.log.debug("skipping dropConnection since connection is already closed") + self.log.debug('dropping connection to peer {peer} skipped - connection already closed', peer=self.peer) def _fail_connection(self, code=CLOSE_STATUS_CODE_GOING_AWAY, reason=u'going away'): """ diff --git a/autobahn/websocket/test/__init__.py b/autobahn/websocket/test/__init__.py index 8a4c67bf..89caae25 100644 --- a/autobahn/websocket/test/__init__.py +++ b/autobahn/websocket/test/__init__.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/test/test_protocol.py b/autobahn/websocket/test/test_protocol.py index 9e578bfc..aee732fc 100644 --- a/autobahn/websocket/test/test_protocol.py +++ b/autobahn/websocket/test/test_protocol.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/test/test_websocket.py b/autobahn/websocket/test/test_websocket.py index 81a23147..0e76ab09 100644 --- a/autobahn/websocket/test/test_websocket.py +++ b/autobahn/websocket/test/test_websocket.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/test/test_websocket_url.py b/autobahn/websocket/test/test_websocket_url.py index 4fba7973..15fd8b5e 100644 --- a/autobahn/websocket/test/test_websocket_url.py +++ b/autobahn/websocket/test/test_websocket_url.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/types.py b/autobahn/websocket/types.py index 1b99a2f6..37c73498 100644 --- a/autobahn/websocket/types.py +++ b/autobahn/websocket/types.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/utf8validator.py b/autobahn/websocket/utf8validator.py index bb4ad347..5828fd67 100644 --- a/autobahn/websocket/utf8validator.py +++ b/autobahn/websocket/utf8validator.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/util.py b/autobahn/websocket/util.py index 3a47374c..3935a1d8 100644 --- a/autobahn/websocket/util.py +++ b/autobahn/websocket/util.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/autobahn/websocket/xormasker.py b/autobahn/websocket/xormasker.py index 84f6c6bb..d52ffee5 100644 --- a/autobahn/websocket/xormasker.py +++ b/autobahn/websocket/xormasker.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/docs/changelog.rst b/docs/changelog.rst index 795fa8b7..10423509 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,17 @@ Changelog ========= +0.16.1 +------ + +`Published 2016-11-07 =Twisted-12.2', diff --git a/examples/twisted/websocket/echo_service/twisted/plugins/echows_plugin.py b/examples/twisted/websocket/echo_service/twisted/plugins/echows_plugin.py index 94338b03..f62dc111 100644 --- a/examples/twisted/websocket/echo_service/twisted/plugins/echows_plugin.py +++ b/examples/twisted/websocket/echo_service/twisted/plugins/echows_plugin.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_site/server.py b/examples/twisted/websocket/echo_site/server.py index 9c9b3497..e8abe203 100644 --- a/examples/twisted/websocket/echo_site/server.py +++ b/examples/twisted/websocket/echo_site/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_site_tls/server.py b/examples/twisted/websocket/echo_site_tls/server.py index 02a3142e..df3408d2 100644 --- a/examples/twisted/websocket/echo_site_tls/server.py +++ b/examples/twisted/websocket/echo_site_tls/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_tls/client.py b/examples/twisted/websocket/echo_tls/client.py index 237e30d7..f3213a00 100644 --- a/examples/twisted/websocket/echo_tls/client.py +++ b/examples/twisted/websocket/echo_tls/client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_tls/server.py b/examples/twisted/websocket/echo_tls/server.py index 00444dc1..30c9b804 100644 --- a/examples/twisted/websocket/echo_tls/server.py +++ b/examples/twisted/websocket/echo_tls/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_variants/client.py b/examples/twisted/websocket/echo_variants/client.py index f88aac66..a4de3ccd 100644 --- a/examples/twisted/websocket/echo_variants/client.py +++ b/examples/twisted/websocket/echo_variants/client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_variants/client_reconnecting.py b/examples/twisted/websocket/echo_variants/client_reconnecting.py index 688caeed..5f8a728f 100644 --- a/examples/twisted/websocket/echo_variants/client_reconnecting.py +++ b/examples/twisted/websocket/echo_variants/client_reconnecting.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_variants/client_with_params.py b/examples/twisted/websocket/echo_variants/client_with_params.py index c2ac5ddb..3b821f59 100644 --- a/examples/twisted/websocket/echo_variants/client_with_params.py +++ b/examples/twisted/websocket/echo_variants/client_with_params.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_variants/client_with_proxy.py b/examples/twisted/websocket/echo_variants/client_with_proxy.py index 7cecfdf8..b38ee736 100644 --- a/examples/twisted/websocket/echo_variants/client_with_proxy.py +++ b/examples/twisted/websocket/echo_variants/client_with_proxy.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_variants/server.py b/examples/twisted/websocket/echo_variants/server.py index c785fc7a..60374b17 100644 --- a/examples/twisted/websocket/echo_variants/server.py +++ b/examples/twisted/websocket/echo_variants/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_wsfallbacks/server.py b/examples/twisted/websocket/echo_wsfallbacks/server.py index 9086b090..e02b0472 100644 --- a/examples/twisted/websocket/echo_wsfallbacks/server.py +++ b/examples/twisted/websocket/echo_wsfallbacks/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/echo_wsgi/server.py b/examples/twisted/websocket/echo_wsgi/server.py index 381a7d16..47a31f95 100644 --- a/examples/twisted/websocket/echo_wsgi/server.py +++ b/examples/twisted/websocket/echo_wsgi/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/multiproto/client.py b/examples/twisted/websocket/multiproto/client.py index 8d9f0ac5..13f46f4c 100644 --- a/examples/twisted/websocket/multiproto/client.py +++ b/examples/twisted/websocket/multiproto/client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/multiproto/server1.py b/examples/twisted/websocket/multiproto/server1.py index 6999369c..a1e0a6b7 100644 --- a/examples/twisted/websocket/multiproto/server1.py +++ b/examples/twisted/websocket/multiproto/server1.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/multiproto/server2.py b/examples/twisted/websocket/multiproto/server2.py index 32334fbc..1b42c042 100644 --- a/examples/twisted/websocket/multiproto/server2.py +++ b/examples/twisted/websocket/multiproto/server2.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/ping/client.py b/examples/twisted/websocket/ping/client.py index a81bc5be..96aa3cce 100644 --- a/examples/twisted/websocket/ping/client.py +++ b/examples/twisted/websocket/ping/client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/ping/server.py b/examples/twisted/websocket/ping/server.py index 6c1e6cad..45b8fe77 100644 --- a/examples/twisted/websocket/ping/server.py +++ b/examples/twisted/websocket/ping/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/pingpong_keepalive/client.py b/examples/twisted/websocket/pingpong_keepalive/client.py index 484e9988..4a18be06 100644 --- a/examples/twisted/websocket/pingpong_keepalive/client.py +++ b/examples/twisted/websocket/pingpong_keepalive/client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/pingpong_keepalive/server.py b/examples/twisted/websocket/pingpong_keepalive/server.py index f78eb45b..03f9c0d3 100644 --- a/examples/twisted/websocket/pingpong_keepalive/server.py +++ b/examples/twisted/websocket/pingpong_keepalive/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/reconnecting/client.py b/examples/twisted/websocket/reconnecting/client.py index e31d6dd7..1c50e5e9 100644 --- a/examples/twisted/websocket/reconnecting/client.py +++ b/examples/twisted/websocket/reconnecting/client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/reconnecting/server.py b/examples/twisted/websocket/reconnecting/server.py index 5691616b..c4c8c16c 100644 --- a/examples/twisted/websocket/reconnecting/server.py +++ b/examples/twisted/websocket/reconnecting/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/slowsquare/client.py b/examples/twisted/websocket/slowsquare/client.py index 35118329..e6851c3d 100644 --- a/examples/twisted/websocket/slowsquare/client.py +++ b/examples/twisted/websocket/slowsquare/client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/slowsquare/server.py b/examples/twisted/websocket/slowsquare/server.py index eae45571..87157460 100644 --- a/examples/twisted/websocket/slowsquare/server.py +++ b/examples/twisted/websocket/slowsquare/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/streaming/frame_based_client.py b/examples/twisted/websocket/streaming/frame_based_client.py index 181c60e3..5e51d937 100644 --- a/examples/twisted/websocket/streaming/frame_based_client.py +++ b/examples/twisted/websocket/streaming/frame_based_client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/streaming/frame_based_server.py b/examples/twisted/websocket/streaming/frame_based_server.py index ba23e6cc..a5f8f167 100644 --- a/examples/twisted/websocket/streaming/frame_based_server.py +++ b/examples/twisted/websocket/streaming/frame_based_server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/streaming/message_based_client.py b/examples/twisted/websocket/streaming/message_based_client.py index 25f8ed45..44a26a35 100644 --- a/examples/twisted/websocket/streaming/message_based_client.py +++ b/examples/twisted/websocket/streaming/message_based_client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/streaming/message_based_server.py b/examples/twisted/websocket/streaming/message_based_server.py index ec2c06f1..21f29a5c 100644 --- a/examples/twisted/websocket/streaming/message_based_server.py +++ b/examples/twisted/websocket/streaming/message_based_server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/streaming/ranstring.py b/examples/twisted/websocket/streaming/ranstring.py index abb4bd12..4641bd9f 100644 --- a/examples/twisted/websocket/streaming/ranstring.py +++ b/examples/twisted/websocket/streaming/ranstring.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/streaming/streaming_client.py b/examples/twisted/websocket/streaming/streaming_client.py index 27d1a1a2..a3619732 100644 --- a/examples/twisted/websocket/streaming/streaming_client.py +++ b/examples/twisted/websocket/streaming/streaming_client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/streaming/streaming_producer_client.py b/examples/twisted/websocket/streaming/streaming_producer_client.py index 7a9a296d..395c35b1 100644 --- a/examples/twisted/websocket/streaming/streaming_producer_client.py +++ b/examples/twisted/websocket/streaming/streaming_producer_client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/streaming/streaming_server.py b/examples/twisted/websocket/streaming/streaming_server.py index 851ea865..fb910025 100644 --- a/examples/twisted/websocket/streaming/streaming_server.py +++ b/examples/twisted/websocket/streaming/streaming_server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/testee/testee_client.py b/examples/twisted/websocket/testee/testee_client.py index 4f9aec19..698b11a6 100644 --- a/examples/twisted/websocket/testee/testee_client.py +++ b/examples/twisted/websocket/testee/testee_client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/testee/testee_server.py b/examples/twisted/websocket/testee/testee_server.py index 0c0323b4..87eb397a 100644 --- a/examples/twisted/websocket/testee/testee_server.py +++ b/examples/twisted/websocket/testee/testee_server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/wrapping/client.py b/examples/twisted/websocket/wrapping/client.py index 545cf065..533fa66a 100644 --- a/examples/twisted/websocket/wrapping/client.py +++ b/examples/twisted/websocket/wrapping/client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/wrapping/client_endpoint.py b/examples/twisted/websocket/wrapping/client_endpoint.py index 66dbc2f8..10ea1d76 100644 --- a/examples/twisted/websocket/wrapping/client_endpoint.py +++ b/examples/twisted/websocket/wrapping/client_endpoint.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/wrapping/server.py b/examples/twisted/websocket/wrapping/server.py index 71c8cbc4..c41d5b81 100644 --- a/examples/twisted/websocket/wrapping/server.py +++ b/examples/twisted/websocket/wrapping/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/wrapping/server_endpoint.py b/examples/twisted/websocket/wrapping/server_endpoint.py index 63c0f1af..a318c0be 100644 --- a/examples/twisted/websocket/wrapping/server_endpoint.py +++ b/examples/twisted/websocket/wrapping/server_endpoint.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/wxpython/client.py b/examples/twisted/websocket/wxpython/client.py index a00d9a8c..2eaf8ebb 100644 --- a/examples/twisted/websocket/wxpython/client.py +++ b/examples/twisted/websocket/wxpython/client.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/examples/twisted/websocket/wxpython/server.py b/examples/twisted/websocket/wxpython/server.py index a3f08fdd..b05aadca 100644 --- a/examples/twisted/websocket/wxpython/server.py +++ b/examples/twisted/websocket/wxpython/server.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/setup.py b/setup.py index b5a323b9..615c6509 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -167,13 +167,12 @@ setup( description='WebSocket client & server library, WAMP real-time framework', long_description=docstr, license='MIT License', - author='Tavendo GmbH', - author_email='autobahnws@googlegroups.com', + author='Crossbar.io Technologies GmbH', url='http://crossbar.io/autobahn', platforms='Any', install_requires=[ 'six>=1.10.0', # MIT license - 'txaio>=2.5.1', # MIT license + 'txaio>=2.5.2', # MIT license ], extras_require={ 'all': extras_require_all, diff --git a/tox.ini b/tox.ini index 97605313..d415d55e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,11 @@ [tox] envlist = flake8 - py27-{tw121,tw132,tw154,tw162,twtrunk,asyncio} - pypy-{tw121,tw132,tw154,tw162,twtrunk,asyncio} - py33-{tw154,tw162,twtrunk,asyncio} - py34-{tw154,tw162,twtrunk,asyncio} - py35-{tw154,tw162,twtrunk,asyncio} + py27-{tw121,tw132,tw154,tw165,twtrunk,asyncio} + pypy-{tw121,tw132,tw154,tw165,twtrunk,asyncio} + py33-{tw154,tw165,twtrunk,asyncio} + py34-{tw154,tw165,twtrunk,asyncio} + py35-{tw154,tw165,twtrunk,asyncio} [flake8] @@ -24,15 +24,15 @@ deps = py-ubjson ; txaio - git+https://github.com/tavendo/txaio + git+https://github.com/crossbario/txaio ; twisted dependencies tw121: twisted==12.1.0 tw132: twisted==13.2.0 tw154: twisted==15.4.0 - tw162: twisted==16.2.0 + tw165: twisted==16.5.0 twtrunk: https://github.com/twisted/twisted/archive/trunk.zip - {tw121,tw132,tw154,tw162,twtrunk}: pytest-twisted + {tw121,tw132,tw154,tw165,twtrunk}: pytest-twisted ; asyncio dependencies py26-asyncio: trollius>=2.0 @@ -47,7 +47,7 @@ commands = python -V coverage --version asyncio: coverage run --source {envsitepackagesdir}/autobahn/ {envbindir}/py.test {envsitepackagesdir}/autobahn/ - tw121,tw132,tw154,tw162,twtrunk: coverage run {envbindir}/trial autobahn + tw121,tw132,tw154,tw165,twtrunk: coverage run {envbindir}/trial autobahn coverage report whitelist_externals = sh @@ -56,7 +56,7 @@ setenv = PYUBJSON_NO_EXTENSION = 1 SODIUM_INSTALL = bundled asyncio: USE_ASYNCIO = 1 - tw121,tw132,tw154,tw162,twtrunk: USE_TWISTED = 1 + tw121,tw132,tw154,tw165,twtrunk: USE_TWISTED = 1 [testenv:flake8] diff --git a/twisted/plugins/autobahn_endpoints.py b/twisted/plugins/autobahn_endpoints.py index c9f107b4..2538d292 100644 --- a/twisted/plugins/autobahn_endpoints.py +++ b/twisted/plugins/autobahn_endpoints.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/twisted/plugins/autobahn_twistd.py b/twisted/plugins/autobahn_twistd.py index 7a99b2e3..142541b9 100644 --- a/twisted/plugins/autobahn_twistd.py +++ b/twisted/plugins/autobahn_twistd.py @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) Tavendo GmbH +# Copyright (c) Crossbar.io Technologies GmbH # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal