Merge branch 'develop' into asyncio

# Conflicts:
#	requirements.txt
This commit is contained in:
Dan 2019-02-07 16:28:11 +01:00
commit cfcc4195ae

View File

@ -19,6 +19,7 @@
import asyncio import asyncio
import sys import sys
if sys.version_info[:3] in [(3, 5, 0), (3, 5, 1), (3, 5, 2)]:
from .vendor import typing from .vendor import typing
# Monkey patch the standard "typing" module because Python versions from 3.5.0 to 3.5.2 have a broken one. # Monkey patch the standard "typing" module because Python versions from 3.5.0 to 3.5.2 have a broken one.