Merge remote-tracking branch 'origin/master' into cookie_filter

# Conflicts:
#	aiohttp/client.py

.travis.yml

@@ -21,6 +21,7 @@ install:
   - pip install --upgrade pip wheel
   - pip install --upgrade setuptools
   - pip install -r requirements-ci.txt
+  - pip install aiodns
   - pip install coveralls
 
 script:

CHANGES.txt

@@ -4,6 +4,41 @@ CHANGES
 0.22.0 (XX-XX-XXXX)
 -------------------
 
+- Fix bug in serving static directory #803
+
+- Fix command line arg parsing #797
+
+- Fix a documentation chapter about cookie usage #790
+
+- Handle empty body with gzipped encoding #758
+
+- Support 451 Unavailable For Legal Reasons http status  #697
+
+- Fix Cookie share example and few small typos in docs #817
+
+- UrlDispatcher.add_route with partial coroutine handler #814
+
+- Optional support for aiodns #728
+
+- Add ServiceRestart and TryAgainLater websocket close codes #828
+
+- Fix prompt message for `web.run_app` #832
+
+- Allow to pass None as a timeout value to disable timeout logic #834
+
+0.21.5 (04-22-2016)
+-------------------
+
+- Fix command line arg parsing #797
+
+0.21.4 (03-12-2016)
+-------------------
+
+- Fix ResourceAdapter: dont add method to allowed if resource is not
+  match #826
+
+- Fix Resouce: append found method to returned allowed methods
+
 0.21.2 (02-16-2016)
 -------------------
 

CONTRIBUTORS.txt

@@ -5,6 +5,7 @@ A. Jesse Jiryu Davis
 Alejandro Gómez
 Alex Khomchenko
 Alex Lisovoy
+Alex Key
 Alexander Bayandin
 Alexander Karpinsky
 Alexander Malev
@@ -54,6 +55,7 @@ Kirill Klenov
 Kirill Malovitsa
 Kyrylo Perevozchikov
 Lars P. Søndergaard
+Louis-Philippe Huberdeau
 Ludovic Gasc
 Lukasz Marcin Dobrzanski
 Marco Paolini
@@ -78,6 +80,7 @@ Sebastian Hüther
 Sergey Ninua
 Sergey Skripnick
 Simon Kennedy
+Sin-Woo Bang
 Stanislas Plum
 Stanislav Prokop
 Stephen Granade
@@ -94,5 +97,7 @@ Vladimir Rutsky
 Vladimir Shulyak
 Vladimir Zakharov
 W. Trevor King
+Willem de Groot
 Yannick Koechlin
-Коренберг Марк
+Марк Коренберг
+Семён Марьясин

ISSUE_TEMPLATE.md

@@ -0,0 +1,23 @@
+## Long story short
+
+<!-- Please describe your problem and why the fix is important. -->
+
+## Expected behaviour
+
+<!-- What the behaviour did you expect? -->
+
+## Actual behaviour
+
+<!-- What's actually happened? -->
+
+## Steps to reproduce
+
+<!-- Please describe steps to reproduce the issue.
+     If you have a script that does that please include it here within
+     markdown code markup -->
+
+## Your environment
+
+<!-- Describe the environment you have that leed to your issue.
+     This includes project version, OS, proxy server and else bits that
+     are related to your case. -->

Makefile

@@ -8,8 +8,8 @@ flake: .install-deps
 #	python setup.py check -rms
 	flake8 aiohttp
 	if python -c "import sys; sys.exit(sys.version_info < (3,5))"; then \
-            flake8 examples tests; \
-        fi
+	    flake8 examples tests; \
+	fi
 
 
 .develop: .install-deps $(shell find aiohttp -type f)
@@ -26,13 +26,13 @@ cov cover coverage:
 	tox
 
 cov-dev: .develop
-	py.test --cov=aiohttp --cov-report=term --cov-report=html tests 
+	py.test --cov=aiohttp --cov-report=term --cov-report=html tests
 	@echo "open file://`pwd`/coverage/index.html"
 
 cov-dev-full: .develop
-	AIOHTTP_NO_EXTENSIONS=1 py.test --cov=aiohttp --cov-append tests 
-	PYTHONASYNCIODEBUG=1 py.test --cov=aiohttp --cov-append tests 
-	py.test --cov=aiohttp --cov-report=term --cov-report=html tests 
+	AIOHTTP_NO_EXTENSIONS=1 py.test --cov=aiohttp --cov-append tests
+	PYTHONASYNCIODEBUG=1 py.test --cov=aiohttp --cov-append tests
+	py.test --cov=aiohttp --cov-report=term --cov-report=html tests
 	@echo "open file://`pwd`/coverage/index.html"
 
 clean:

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,28 @@
+<!-- Thank you for your contribution!
+
+     Before submit your Pull Request, make sure you picked
+     the right branch:
+
+     - If you propose a new feature or improvement, select "master"
+       as a target branch;
+     - If this is code bug fix or documentation correction, select
+       the lastest release branch (which looks like "0.xx") -->
+
+## What these changes does?
+
+<!-- Please give a short brief about these changes. -->
+
+## How to test your changes?
+
+<!-- Describe how we can test your changes if they provides
+     any notable behaviour for the end users. -->
+
+## Related issue number
+
+<!-- Is there any issue opened that get fixed by this? -->
+
+## Checklist
+
+- [ ] Code is written and well
+- [ ] Tests for the changes are provided
+- [ ] Documentation reflects the changes

aiohttp/__init__.py

@@ -2,7 +2,9 @@
 
 __version__ = '0.22.0a0'
 
+import multidict  # noqa
 
+from multidict import *  # noqa
 from . import hdrs  # noqa
 from .protocol import *  # noqa
 from .connector import *  # noqa
@@ -12,20 +14,19 @@
 from .helpers import *  # noqa
 from .parsers import *  # noqa
 from .streams import *  # noqa
-from .multidict import *  # noqa
 from .multipart import *  # noqa
 from .websocket_client import *  # noqa
 
 
-__all__ = (client.__all__ +
-           client_reqrep.__all__ +
-           errors.__all__ +
-           helpers.__all__ +
-           parsers.__all__ +
-           protocol.__all__ +
-           connector.__all__ +
-           streams.__all__ +
-           multidict.__all__ +
-           multipart.__all__ +
-           websocket_client.__all__ +
+__all__ = (client.__all__ +  # noqa
+           client_reqrep.__all__ +  # noqa
+           errors.__all__ +  # noqa
+           helpers.__all__ +  # noqa
+           parsers.__all__ +  # noqa
+           protocol.__all__ +  # noqa
+           connector.__all__ +  # noqa
+           streams.__all__ +  # noqa
+           multidict.__all__ +  # noqa
+           multipart.__all__ +  # noqa
+           websocket_client.__all__ +  # noqa
            ('hdrs', '__version__'))