diff options
author | Guido van Rossum <guido@dropbox.com> | 2015-12-13 01:02:15 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@dropbox.com> | 2015-12-13 01:02:15 (GMT) |
commit | 707244736a1fa5d8ca171e5e172569d77af62e17 (patch) | |
tree | 14f7067802943f918f174bbe5144f7899d1cfb20 | |
parent | 33d8a1b42610c88f94c2df8fd1a32d4877581e7e (diff) | |
parent | 1a316e82f658868a1698ef167f62a49048b36685 (diff) | |
download | cpython-707244736a1fa5d8ca171e5e172569d77af62e17.zip cpython-707244736a1fa5d8ca171e5e172569d77af62e17.tar.gz cpython-707244736a1fa5d8ca171e5e172569d77af62e17.tar.bz2 |
Sync asyncio with upstream git repo (conditional import in test_pep492.py). (Merge 3.5->3.6)
-rw-r--r-- | Lib/test/test_asyncio/test_pep492.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_asyncio/test_pep492.py b/Lib/test/test_asyncio/test_pep492.py index 404a748..29aba81 100644 --- a/Lib/test/test_asyncio/test_pep492.py +++ b/Lib/test/test_asyncio/test_pep492.py @@ -4,7 +4,10 @@ import collections.abc import types import unittest -from test import support +try: + from test import support +except ImportError: + from asyncio import test_support as support from unittest import mock import asyncio |