Merge stdlib/3.4 into stdlib/3 (#2303)

* Merge stdlib/3.4 into stdlib/3

* Move asyncio back to 3.4 for now
This commit is contained in:
Sebastian Rittau
2018-07-03 17:13:54 +02:00
committed by Jelle Zijlstra
parent 1ae2ba0fbe
commit 9229dd8f0c
8 changed files with 1 additions and 1 deletions

View File

@@ -14,7 +14,7 @@ consistent_files = [
{'stdlib/2and3/pyexpat/errors.pyi', 'stdlib/2and3/xml/parsers/expat/errors.pyi'},
{'stdlib/2and3/pyexpat/model.pyi', 'stdlib/2and3/xml/parsers/expat/model.pyi'},
{'stdlib/3/ntpath.pyi', 'stdlib/3/posixpath.pyi', 'stdlib/3/macpath.pyi', 'stdlib/3/posixpath.pyi'},
{'stdlib/3.4/enum.pyi', 'third_party/3/enum.pyi'},
{'stdlib/3/enum.pyi', 'third_party/3/enum.pyi'},
{'stdlib/2/os/path.pyi', 'stdlib/3/os/path.pyi'},
{'stdlib/3/unittest/mock.pyi', 'third_party/2and3/mock.pyi'},
{'stdlib/3/concurrent/__init__.pyi', 'third_party/2/concurrent/__init__.pyi'},