[Python-modules-commits] [python-websockets] 03/08: 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 da29f8b93f967042f8af97741fb2800b7cf852b0
Merge: 679c796 4af41ef
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Fri Jun 30 14:45:31 2017 +0200

    merge patched into master

 PKG-INFO                                           |  10 ++--
 README => README.rst                               |   0
 debian/.git-dpm                                    |   6 +--
 .../patches/0001-Fix-tests-on-Python-3.5.2.patch   |  41 ----------------
 debian/patches/series                              |   1 -
 setup.cfg                                          |   4 +-
 setup.py                                           |  54 +++++++++------------
 websockets.egg-info/PKG-INFO                       |  10 ++--
 websockets.egg-info/SOURCES.txt                    |   7 ++-
 websockets/http.py                                 |   2 +-
 websockets/protocol.py                             |   9 +++-
 .../py35/__pycache__/__init__.cpython-36.pyc       | Bin 0 -> 146 bytes
 websockets/py35/__pycache__/client.cpython-36.pyc  | Bin 0 -> 1081 bytes
 .../py35/__pycache__/client_server.cpython-36.pyc  | Bin 0 -> 1373 bytes
 websockets/server.py                               |  11 ++++-
 websockets/test_client_server.py                   |   3 +-
 websockets/test_protocol.py                        |  10 +---
 websockets/version.py                              |   2 +-
 18 files changed, 66 insertions(+), 104 deletions(-)

diff --cc debian/.git-dpm
index ca4aff2,0000000..b2bf7ee
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
- 3dc55641e1914ce8c5b39bfbb2bfd4d38c51fa9a
- 3dc55641e1914ce8c5b39bfbb2bfd4d38c51fa9a
- 90b0aa6f6d822ea6f927f1134014594790ebf802
++4af41ef37b2c30dd408c21d5d3853059267bbe85
++4af41ef37b2c30dd408c21d5d3853059267bbe85
++4af41ef37b2c30dd408c21d5d3853059267bbe85
 +4af41ef37b2c30dd408c21d5d3853059267bbe85
 +python-websockets_3.3.orig.tar.gz
 +ab9a51b180e8ff557f49befb673bb5f21778b532
 +33852
 +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