Merge pull request #1166 from gevent/libuv-win-default

Make libuv the default backend on Windows. Fixes #1163.

CHANGES.rst

@@ -19,6 +19,8 @@ Platform Support
 
 - Travis CI tests on Python 3.7.0b3.
 
+- Windows now defaults to the libuv backend. See :issue:`1163`.
+
 Bug Fixes
 ---------
 

appveyor.yml

@@ -11,14 +11,8 @@ environment:
     # a later point release.
 
 
-    - PYTHON: "C:\\pypy2-v5.10.0-win32"
-      PYTHON_ID: "pypy"
-      PYTHON_EXE: pypy
-      PYTHON_VERSION: "2.7.x"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.x" # currently 3.6.0
+    - PYTHON: "C:\\Python27-x64"
+      PYTHON_VERSION: "2.7.x" # currently 2.7.13
       PYTHON_ARCH: "64"
       PYTHON_EXE: python
 
@@ -26,12 +20,12 @@ environment:
       PYTHON_VERSION: "3.6.x" # currently 3.6.0
       PYTHON_ARCH: "64"
       PYTHON_EXE: python
-      GEVENT_LOOP: libuv
 
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x" # currently 2.7.13
-      PYTHON_ARCH: "64"
-      PYTHON_EXE: python
+    - PYTHON: "C:\\pypy2-v5.10.0-win32"
+      PYTHON_ID: "pypy"
+      PYTHON_EXE: pypy
+      PYTHON_VERSION: "2.7.x"
+      PYTHON_ARCH: "32"
 
     - PYTHON: "C:\\Python34-x64"
       PYTHON_VERSION: "3.4.x" # currently 3.4.4

src/gevent/_config.py

@@ -16,6 +16,7 @@ import sys
 import textwrap
 
 from gevent._compat import string_types
+from gevent._compat import WIN
 
 __all__ = [
     'config',
@@ -353,12 +354,19 @@ class Loop(ImportableSetting, Setting):
     desc = """\
     The kind of the loop we use.
 
+    On Windows, this defaults to libuv, while on
+    other platforms it defaults to libev.
+
     """
 
     default = [
         'libev-cext',
         'libev-cffi',
         'libuv-cffi',
+    ] if not WIN else [
+        'libuv-cffi',
+        'libev-cext',
+        'libev-cffi',
     ]
 
     shortname_map = {

src/greentest/greentest/patched_tests_setup.py

@@ -301,17 +301,12 @@ if LIBUV:
 
 
 
-    if WIN and PYPY:
-        # From PyPy2-v5.9.0, using its version of tests,
+    if WIN and PY2:
+        # From PyPy2-v5.9.0 and CPython 2.7.14, using its version of tests,
         # which do work on darwin (and possibly linux?)
         # I can't produce them in a local VM running Windows 10
         # and the same pypy version.
         disabled_tests += [
-            # appears to timeout?
-            'test_threading.ThreadTests.test_finalize_with_trace',
-            'test_asyncore.DispatcherWithSendTests_UsePoll.test_send',
-            'test_asyncore.DispatcherWithSendTests.test_send',
-
             # These, which use asyncore, fail with
             # 'NoneType is not iterable' on 'conn, addr = self.accept()'
             # That returns None when the underlying socket raises
@@ -358,13 +353,6 @@ if LIBUV:
             # This one times out, but it's still a non-blocking socket
             'test_ftplib.TestFTPClass.test_makeport',
 
-            # More unexpected timeouts
-            'test_smtplib.TooLongLineTests.testLineTooLong',
-            'test_smtplib.GeneralTests.testTimeoutValue',
-            'test_ssl.ContextTests.test__https_verify_envvar',
-            'test_subprocess.ProcessTestCase.test_check_output',
-            'test_telnetlib.ReadTests.test_read_eager_A',
-
             # A timeout, possibly because of the way we handle interrupts?
             'test_socketserver.SocketServerTest.test_InterruptedServerSelectCall',
             'test_socketserver.SocketServerTest.test_InterruptServerSelectCall',
@@ -393,6 +381,33 @@ if LIBUV:
             'test_httpservers.BaseHTTPServerTestCase.test_version_digits',
             'test_httpservers.BaseHTTPServerTestCase.test_version_invalid',
             'test_httpservers.BaseHTTPServerTestCase.test_version_none',
+            'test_httpservers.SimpleHTTPServerTestCase.test_get',
+            'test_httpservers.SimpleHTTPServerTestCase.test_head',
+            'test_httpservers.SimpleHTTPServerTestCase.test_invalid_requests',
+            'test_httpservers.SimpleHTTPServerTestCase.test_path_without_leading_slash',
+            'test_httpservers.CGIHTTPServerTestCase.test_invaliduri',
+            'test_httpservers.CGIHTTPServerTestCase.test_issue19435',
+
+            # Sometimes raises LoopExit on CPython
+            'test_socket.BufferIOTest.testRecvFromIntoArray',
+
+            # Unexpected timeouts sometimes
+            'test_smtplib.TooLongLineTests.testLineTooLong',
+            'test_smtplib.GeneralTests.testTimeoutValue',
+
+        ]
+
+        if PYPY:
+            disabled_tests += [
+                # appears to timeout?
+                'test_threading.ThreadTests.test_finalize_with_trace',
+                'test_asyncore.DispatcherWithSendTests_UsePoll.test_send',
+                'test_asyncore.DispatcherWithSendTests.test_send',
+
+                # More unexpected timeouts
+                'test_ssl.ContextTests.test__https_verify_envvar',
+                'test_subprocess.ProcessTestCase.test_check_output',
+                'test_telnetlib.ReadTests.test_read_eager_A',
 
                 # But on Windows, our gc fix for that doesn't work anyway
                 # so we have to disable it.
@@ -423,6 +438,7 @@ if LIBUV:
                 'test_subprocess.CommandsWithSpaces.with_spaces',
             ]
 
+
     if WIN:
 
         disabled_tests += [
@@ -831,7 +847,9 @@ if PY34:
             # ld.so: dl-open.c: 231: dl_open_worker: Assertion
             # `_dl_debug_initialize (0, args->nsid)->r_state ==
             # RT_CONSISTENT' failed!" and fail.
+            disabled_tests += [
                 'test_threading.ThreadTests.test_is_alive_after_fork',
+            ]
 
     if TRAVIS:
         disabled_tests += [