[Python-checkins] cpython (merge 3.5 -> default): Sync asyncio with upstream git repo (conditional import in test_pep492.py).

[guido.van.rossum]

https://hg.python.org/cpython/rev/93538e7d6ed8
changeset:   99542:93538e7d6ed8
parent:      99539:323c10701e5d
parent:      99541:e911f05c945f
user:        Guido van Rossum <guido at dropbox.com>
date:        Sat Dec 12 17:02:15 2015 -0800
summary:
  Sync asyncio with upstream git repo (conditional import in test_pep492.py). (Merge 3.5->3.6)

files:
  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
--- a/Lib/test/test_asyncio/test_pep492.py
+++ b/Lib/test/test_asyncio/test_pep492.py
@@ -4,7 +4,10 @@
 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

-- 
Repository URL: https://hg.python.org/cpython