[Python-modules-commits] [python-websockets] 03/05: merge patched into master

[Piotr Ożarowski]

This is an automated email from the git hooks/post-receive script.

piotr pushed a commit to branch master
in repository python-websockets.

commit acb4f24825b02b1b7af4993a2cefb7e39e8a0c65
Merge: 97f2f92 d9b8e75
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Fri Sep 29 12:01:34 2017 +0200

    merge patched into master

 PKG-INFO                                           |   3 +-
 debian/.git-dpm                                    |   6 +-
 ...e-right-encoding-while-opening-README.rst.patch |  22 --
 debian/patches/series                              |   1 -
 setup.cfg                                          |   3 +-
 setup.py                                           |  16 +-
 websockets.egg-info/PKG-INFO                       |   3 +-
 websockets.egg-info/SOURCES.txt                    |   9 +-
 websockets/client.py                               | 124 +++++--
 websockets/compatibility.py                        |  40 +++
 websockets/exceptions.py                           |  36 +-
 websockets/framing.py                              |  10 +-
 websockets/http.py                                 | 170 +++++++--
 websockets/protocol.py                             |  38 +-
 websockets/py35/__pycache__/server.cpython-35.pyc  | Bin 0 -> 1133 bytes
 websockets/py35/__pycache__/server.cpython-36.pyc  | Bin 0 -> 1088 bytes
 websockets/py35/client_server.py                   |  16 +-
 websockets/py35/server.py                          |  22 ++
 websockets/server.py                               | 363 ++++++++++++++-----
 websockets/speedups.c                              | 130 +++++++
 websockets/test_client_server.py                   | 397 +++++++++++++++------
 websockets/test_http.py                            |  75 +++-
 websockets/test_protocol.py                        |  13 +-
 websockets/test_speedups.py                        |   0
 websockets/test_utils.py                           |  50 +++
 websockets/utils.py                                |  14 +
 websockets/version.py                              |   2 +-
 27 files changed, 1215 insertions(+), 348 deletions(-)

diff --cc debian/.git-dpm
index afaa555,0000000..7e6db72
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- edf789e281e6c22452092ef192cf142992c5c557
- edf789e281e6c22452092ef192cf142992c5c557
- 4af41ef37b2c30dd408c21d5d3853059267bbe85
++d9b8e75e4cf05a6a31e615bc367c45dcd2b1d5db
++d9b8e75e4cf05a6a31e615bc367c45dcd2b1d5db
++d9b8e75e4cf05a6a31e615bc367c45dcd2b1d5db
 +d9b8e75e4cf05a6a31e615bc367c45dcd2b1d5db
 +python-websockets_3.4.orig.tar.gz
 +98955cea7efc3444c6135128aeca0290fadd2ebb
 +41618
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-websockets.git