[Python-modules-commits] [python-aiohttp] 02/03: record new upstream branch created by importing python-aiohttp_1.1.5.orig.tar.gz and merge it

[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-aiohttp.

commit f88eacc0701ecb0d06bca4639d5155076a55ac61
Merge: cb63594 98fe54b
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Fri Nov 18 19:57:41 2016 +0100

    record new upstream branch created by importing python-aiohttp_1.1.5.orig.tar.gz and merge it

 CHANGES.rst                                 | 20 +++++++
 CONTRIBUTORS.txt                            |  1 +
 PKG-INFO                                    | 22 +++++++-
 aiohttp.egg-info/PKG-INFO                   | 22 +++++++-
 aiohttp.egg-info/SOURCES.txt                |  1 +
 aiohttp/__init__.py                         |  2 +-
 aiohttp/client.py                           | 51 ++++--------------
 aiohttp/file_sender.py                      |  2 +-
 aiohttp/test_utils.py                       |  5 +-
 aiohttp/web.py                              |  1 +
 aiohttp/web_urldispatcher.py                | 52 +++++++++++-------
 debian/.git-dpm                             | 14 ++---
 docs/index.rst                              |  1 +
 docs/third_party.rst                        | 82 +++++++++++++++++++++++++++++
 docs/web.rst                                |  6 +--
 examples/background_tasks.py                |  1 +
 examples/client_auth.py                     |  1 +
 examples/client_json.py                     |  1 +
 examples/web_cookies.py                     |  1 +
 examples/web_srv.py                         |  1 +
 setup.cfg                                   |  2 +-
 tests/test_client_functional.py             | 18 +++++++
 tests/test_py35/test_cbv35.py               |  1 +
 tests/test_py35/test_client.py              |  1 +
 tests/test_py35/test_client_websocket_35.py |  1 +
 tests/test_py35/test_resp.py                |  1 +
 tests/test_py35/test_web_websocket_35.py    |  1 +
 tests/test_test_utils.py                    | 12 +++++
 tests/test_urldispatch.py                   | 36 ++++++++++---
 29 files changed, 276 insertions(+), 84 deletions(-)

diff --cc debian/.git-dpm
index ec2f94d,0000000..b27907b
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
- a7eb6ae099efc97dc438674bf440a42fe2ab2a6a
- a7eb6ae099efc97dc438674bf440a42fe2ab2a6a
- a7eb6ae099efc97dc438674bf440a42fe2ab2a6a
- a7eb6ae099efc97dc438674bf440a42fe2ab2a6a
- python-aiohttp_1.1.2.orig.tar.gz
- 04bdc315c44d6fee0ca627e1416bbd85ed97cd6b
- 508997
++98fe54bd7567469b73bb93caa7ea443afd70e309
++98fe54bd7567469b73bb93caa7ea443afd70e309
++98fe54bd7567469b73bb93caa7ea443afd70e309
++98fe54bd7567469b73bb93caa7ea443afd70e309
++python-aiohttp_1.1.5.orig.tar.gz
++8d89d26cf656196de9cc35307a47654727a79fb0
++510247
 +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-aiohttp.git