Skip to content

Commit f8c0e9a

Browse files
panda73111panda73111
committed
Merge remote-tracking branch 'origin/master' into cookie_filter
# Conflicts: # aiohttp/client.py
2 parents 7917132 + 024f6e1 commit f8c0e9a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1034
-2463
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ install:
2121
- pip install --upgrade pip wheel
2222
- pip install --upgrade setuptools
2323
- pip install -r requirements-ci.txt
24+
- pip install aiodns
2425
- pip install coveralls
2526

2627
script:

‎CHANGES.txt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,41 @@ CHANGES
44
0.22.0 (XX-XX-XXXX)
55
-------------------
66

7+
- Fix bug in serving static directory #803
8+
9+
- Fix command line arg parsing #797
10+
11+
- Fix a documentation chapter about cookie usage #790
12+
13+
- Handle empty body with gzipped encoding #758
14+
15+
- Support 451 Unavailable For Legal Reasons http status #697
16+
17+
- Fix Cookie share example and few small typos in docs #817
18+
19+
- UrlDispatcher.add_route with partial coroutine handler #814
20+
21+
- Optional support for aiodns #728
22+
23+
- Add ServiceRestart and TryAgainLater websocket close codes #828
24+
25+
- Fix prompt message for `web.run_app` #832
26+
27+
- Allow to pass None as a timeout value to disable timeout logic #834
28+
29+
0.21.5 (04-22-2016)
30+
-------------------
31+
32+
- Fix command line arg parsing #797
33+
34+
0.21.4 (03-12-2016)
35+
-------------------
36+
37+
- Fix ResourceAdapter: dont add method to allowed if resource is not
38+
match #826
39+
40+
- Fix Resouce: append found method to returned allowed methods
41+
742
0.21.2 (02-16-2016)
843
-------------------
944

‎CONTRIBUTORS.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ A. Jesse Jiryu Davis
55
Alejandro Gómez
66
Alex Khomchenko
77
Alex Lisovoy
8+
Alex Key
89
Alexander Bayandin
910
Alexander Karpinsky
1011
Alexander Malev
@@ -54,6 +55,7 @@ Kirill Klenov
5455
Kirill Malovitsa
5556
Kyrylo Perevozchikov
5657
Lars P. Søndergaard
58+
Louis-Philippe Huberdeau
5759
Ludovic Gasc
5860
Lukasz Marcin Dobrzanski
5961
Marco Paolini
@@ -78,6 +80,7 @@ Sebastian Hüther
7880
Sergey Ninua
7981
Sergey Skripnick
8082
Simon Kennedy
83+
Sin-Woo Bang
8184
Stanislas Plum
8285
Stanislav Prokop
8386
Stephen Granade
@@ -94,5 +97,7 @@ Vladimir Rutsky
9497
Vladimir Shulyak
9598
Vladimir Zakharov
9699
W. Trevor King
100+
Willem de Groot
97101
Yannick Koechlin
98-
Коренберг Марк
102+
Марк Коренберг
103+
Семён Марьясин

‎ISSUE_TEMPLATE.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
## Long story short
2+
3+
<!-- Please describe your problem and why the fix is important. -->
4+
5+
## Expected behaviour
6+
7+
<!-- What the behaviour did you expect? -->
8+
9+
## Actual behaviour
10+
11+
<!-- What's actually happened? -->
12+
13+
## Steps to reproduce
14+
15+
<!-- Please describe steps to reproduce the issue.
16+
If you have a script that does that please include it here within
17+
markdown code markup -->
18+
19+
## Your environment
20+
21+
<!-- Describe the environment you have that leed to your issue.
22+
This includes project version, OS, proxy server and else bits that
23+
are related to your case. -->

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ flake: .install-deps
88
# python setup.py check -rms
99
flake8 aiohttp
1010
if python -c "import sys; sys.exit(sys.version_info < (3,5))"; then \
11-
flake8 examples tests; \
12-
fi
11+
flake8 examples tests; \
12+
fi
1313

1414

1515
.develop: .install-deps $(shell find aiohttp -type f)
@@ -26,13 +26,13 @@ cov cover coverage:
2626
tox
2727

2828
cov-dev: .develop
29-
py.test --cov=aiohttp --cov-report=term --cov-report=html tests
29+
py.test --cov=aiohttp --cov-report=term --cov-report=html tests
3030
@echo "open file://`pwd`/coverage/index.html"
3131

3232
cov-dev-full: .develop
33-
AIOHTTP_NO_EXTENSIONS=1 py.test --cov=aiohttp --cov-append tests
34-
PYTHONASYNCIODEBUG=1 py.test --cov=aiohttp --cov-append tests
35-
py.test --cov=aiohttp --cov-report=term --cov-report=html tests
33+
AIOHTTP_NO_EXTENSIONS=1 py.test --cov=aiohttp --cov-append tests
34+
PYTHONASYNCIODEBUG=1 py.test --cov=aiohttp --cov-append tests
35+
py.test --cov=aiohttp --cov-report=term --cov-report=html tests
3636
@echo "open file://`pwd`/coverage/index.html"
3737

3838
clean:

‎PULL_REQUEST_TEMPLATE.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!-- Thank you for your contribution!
2+
3+
Before submit your Pull Request, make sure you picked
4+
the right branch:
5+
6+
- If you propose a new feature or improvement, select "master"
7+
as a target branch;
8+
- If this is code bug fix or documentation correction, select
9+
the lastest release branch (which looks like "0.xx") -->
10+
11+
## What these changes does?
12+
13+
<!-- Please give a short brief about these changes. -->
14+
15+
## How to test your changes?
16+
17+
<!-- Describe how we can test your changes if they provides
18+
any notable behaviour for the end users. -->
19+
20+
## Related issue number
21+
22+
<!-- Is there any issue opened that get fixed by this? -->
23+
24+
## Checklist
25+
26+
- [ ] Code is written and well
27+
- [ ] Tests for the changes are provided
28+
- [ ] Documentation reflects the changes

‎aiohttp/__init__.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
__version__ = '0.22.0a0'
44

5+
import multidict # noqa
56

7+
from multidict import * # noqa
68
from . import hdrs # noqa
79
from .protocol import * # noqa
810
from .connector import * # noqa
@@ -12,20 +14,19 @@
1214
from .helpers import * # noqa
1315
from .parsers import * # noqa
1416
from .streams import * # noqa
15-
from .multidict import * # noqa
1617
from .multipart import * # noqa
1718
from .websocket_client import * # noqa
1819

1920

20-
__all__ = (client.__all__ +
21-
client_reqrep.__all__ +
22-
errors.__all__ +
23-
helpers.__all__ +
24-
parsers.__all__ +
25-
protocol.__all__ +
26-
connector.__all__ +
27-
streams.__all__ +
28-
multidict.__all__ +
29-
multipart.__all__ +
30-
websocket_client.__all__ +
21+
__all__ = (client.__all__ + # noqa
22+
client_reqrep.__all__ + # noqa
23+
errors.__all__ + # noqa
24+
helpers.__all__ + # noqa
25+
parsers.__all__ + # noqa
26+
protocol.__all__ + # noqa
27+
connector.__all__ + # noqa
28+
streams.__all__ + # noqa
29+
multidict.__all__ + # noqa
30+
multipart.__all__ + # noqa
31+
websocket_client.__all__ + # noqa
3132
('hdrs', '__version__'))

0 commit comments

Comments
 (0)