From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Tue, 15 Nov 2016 16:03:12 +0000 (+0100)
Subject: Issue 28668: Merge 3.5
X-Git-Tag: v3.6.0b4~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d178e69ad859703ae1873f5fc4ac3be357b7f8e4;p=python

Issue 28668: Merge 3.5
---

d178e69ad859703ae1873f5fc4ac3be357b7f8e4
diff --cc Lib/test/support/__init__.py
index d862d8b457,09095db265..81136100f0
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@@ -90,9 -89,9 +90,9 @@@ __all__ = 
      "bigmemtest", "bigaddrspacetest", "cpython_only", "get_attribute",
      "requires_IEEE_754", "skip_unless_xattr", "requires_zlib",
      "anticipate_failure", "load_package_tests", "detect_api_mismatch",
-     "check__all__", "requires_android_level",
 -     "requires_multiprocessing_queue",
++    "check__all__", "requires_android_level", "requires_multiprocessing_queue",
      # sys
 -    "is_jython", "check_impl_detail",
 +    "is_jython", "is_android", "check_impl_detail", "unix_shell",
      # network
      "HOST", "IPV6_ENABLED", "find_unused_port", "bind_port", "open_urlresource",
      # processes