summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2015-12-13 01:01:47 (GMT)
committerGuido van Rossum <guido@python.org>2015-12-13 01:01:47 (GMT)
commit1a316e82f658868a1698ef167f62a49048b36685 (patch)
tree33114100f2d6424f073a1e6087efee8b0afbe4aa /Lib
parentdda584340e88004b534de6c24a39633bdfdf0104 (diff)
downloadcpython-1a316e82f658868a1698ef167f62a49048b36685.zip
cpython-1a316e82f658868a1698ef167f62a49048b36685.tar.gz
cpython-1a316e82f658868a1698ef167f62a49048b36685.tar.bz2
Sync asyncio with upstream git repo (conditional import in test_pep492.py).
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_asyncio/test_pep492.py5
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