From 6fad958cb77d2ca83f87704b3162b20cbe0b9965 Mon Sep 17 00:00:00 2001 From: BeatButton Date: Sun, 9 Sep 2018 09:37:53 -0600 Subject: [PATCH 1/4] Correct imports for 3.8 --- aiohttp/multipart.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aiohttp/multipart.py b/aiohttp/multipart.py index 0e46ea45f76..736745c4496 100644 --- a/aiohttp/multipart.py +++ b/aiohttp/multipart.py @@ -5,7 +5,8 @@ import uuid import warnings import zlib -from collections import Mapping, Sequence, deque +from collections import deque +from collections.abc import Mapping, Sequence from urllib.parse import parse_qsl, unquote, urlencode from multidict import CIMultiDict From e930384968faf47d1a5a7ab5ec6f8f4ff0058f39 Mon Sep 17 00:00:00 2001 From: BeatButton Date: Sun, 9 Sep 2018 09:40:56 -0600 Subject: [PATCH 2/4] Update CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 1e0e71b3716..c5fcd50c20c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -144,6 +144,7 @@ Michael Ihnatenko Mikhail Kashkin Mikhail Lukyanchenko Misha Behersky +Mitchell Ferree Morgan Delahaye-Prat Moss Collum Mun Gwan-gyeong From d0b4f1a4c2d64f7159e0bac3134cfb42e5c54b71 Mon Sep 17 00:00:00 2001 From: BeatButton Date: Sun, 9 Sep 2018 09:47:47 -0600 Subject: [PATCH 3/4] Add news fragment --- CHANGES/ID.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGES/ID.bugfix diff --git a/CHANGES/ID.bugfix b/CHANGES/ID.bugfix new file mode 100644 index 00000000000..35481e7b803 --- /dev/null +++ b/CHANGES/ID.bugfix @@ -0,0 +1 @@ +Change imports from collections module in preparation for 3.8. \ No newline at end of file From 7a3829aa8bbc56d3dffa51e3a19508b024445fa4 Mon Sep 17 00:00:00 2001 From: BeatButton Date: Sun, 9 Sep 2018 09:49:32 -0600 Subject: [PATCH 4/4] Rename fragment --- CHANGES/{ID.bugfix => 3258.bugfix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CHANGES/{ID.bugfix => 3258.bugfix} (100%) diff --git a/CHANGES/ID.bugfix b/CHANGES/3258.bugfix similarity index 100% rename from CHANGES/ID.bugfix rename to CHANGES/3258.bugfix