Merge py35

.travis.yml

@@ -6,6 +6,7 @@ python:
     - pypy
     - 3.3
     - 3.4
+    - 3.5
 env:
     - LINT=true
     - LINT=false

README.rst

@@ -24,8 +24,9 @@ gevent is licensed under MIT license.
 get gevent
 ==========
 
-Install Python 2.6, 2.7, 3.3 or 3.4 along with the greenlet_
-extension. Or install PyPy 2.6 or above (but not PyPy3).
+Install Python 2.6, 2.7, 3.3 or 3.4 along with the greenlet_ extension
+(Python 3.5 has preliminary support). Or install PyPy 2.6 or above
+(but not PyPy3).
 
 Download the latest release from `Python Package Index`_ or clone `the repository`_.
 

changelog.rst

@@ -9,6 +9,8 @@
 
 - Fix a possible ``ValueError`` from ``gevent.queue.Queue:peek``.
   Reported in :issue:`647` by Kevin Chen.
+- ``gevent.subprocess`` works under Python 3.5. In general, Python 3.5
+  has preliminary support. Reported in :issue:`653` by Squeaky.
 
 1.1b4 (Sep 4, 2015)
 ===================

doc/whatsnew_1_1.rst

@@ -18,8 +18,15 @@ Support for Python 2.5 was removed when support for Python 3 was
 added. Any further releases in the 1.0.x line will maintain support
 for Python 2.5.
 
+Python 3.5 has preliminary support, which means that gevent is
+expected to generally run and function with the same level of support
+as on Python 3.4, but new features and APIs introduced in 3.5 may not
+be properly supported (e.g., `DevpollSelector`_) and due to the recent
+arrival of Python 3.5, the level of testing it has received is lower.
+
 .. _python.org: http://www.python.org/downloads/
 .. _PyPy: http://pypy.org
+.. _DevpollSelector: https://docs.python.org/3.5/whatsnew/3.5.html#selectors
 
 PyPy Notes
 ----------

gevent/builtins.py

@@ -2,7 +2,7 @@
 """gevent friendly implementations of builtin functions."""
 from __future__ import absolute_import
 
-import imp
+import imp # deprecated since 3.4; issues PendingDeprecationWarning in 3.5
 import sys
 import gevent.lock
 

gevent/queue.py

@@ -41,6 +41,7 @@ from gevent.hub import InvalidSwitchError
 
 __all__ = ['Queue', 'PriorityQueue', 'LifoQueue', 'JoinableQueue', 'Channel']
 
+
 def _safe_remove(deq, item):
     # For when the item may have been removed by
     # Queue._unlock
@@ -49,6 +50,7 @@ def _safe_remove(deq, item):
     except ValueError:
         pass
 
+
 class Queue(object):
     """
     Create a queue object with a given maximum size.

gevent/subprocess.py

@@ -27,17 +27,20 @@ import subprocess as __subprocess__
 
 
 # Standard functions and classes that this module re-implements in a gevent-aware way.
-__implements__ = ['Popen',
+__implements__ = [
+    'Popen',
     'call',
     'check_call',
-                  'check_output']
+    'check_output',
+]
 if PY3:
     __implements__.append("_posixsubprocess")
     _posixsubprocess = None
 
 
 # Standard functions and classes that this module re-imports.
-__imports__ = ['PIPE',
+__imports__ = [
+    'PIPE',
     'STDOUT',
     'CalledProcessError',
     # Windows:
@@ -48,10 +51,12 @@ __imports__ = ['PIPE',
     'STD_ERROR_HANDLE',
     'SW_HIDE',
     'STARTF_USESTDHANDLES',
-               'STARTF_USESHOWWINDOW']
+    'STARTF_USESHOWWINDOW',
+]
 
 
-__extra__ = ['MAXFD',
+__extra__ = [
+    'MAXFD',
     '_eintr_retry_call',
     'STARTUPINFO',
     'pywintypes',
@@ -71,13 +76,31 @@ __extra__ = ['MAXFD',
     'GetVersion',
     'CreateProcess',
     'INFINITE',
-             'TerminateProcess']
+    'TerminateProcess',
+]
 
 if sys.version_info[:2] >= (3, 3):
-    __imports__ += ['DEVNULL',
+    __imports__ += [
+        'DEVNULL',
         'getstatusoutput',
         'getoutput',
-                    'TimeoutExpired']
+        'SubprocessError',
+        'TimeoutExpired',
+    ]
+
+if sys.version_info[:2] >= (3, 5):
+    __imports__ += [
+        'run', # in 3.5, `run` is implemented in terms of `with Popen`
+        'CompletedProcess',
+    ]
+    # Removed in Python 3.5; this is the exact code that was removed:
+    # https://hg.python.org/cpython/rev/f98b0a5e5ef5
+    __extra__.remove('MAXFD')
+    try:
+        MAXFD = os.sysconf("SC_OPEN_MAX")
+    except:
+        MAXFD = 256
+
 
 for name in __imports__[:]:
     try:

gevent/util.py

@@ -9,6 +9,7 @@ import functools
 
 __all__ = ['wrap_errors']
 
+
 class wrap_errors(object):
     """
     Helper to make function return an exception, rather than raise it.

tox.ini

 [tox]
 envlist =
-    py26,py27,pypy,py33,py34,lint
+    py26,py27,pypy,py33,py34,py35,lint
 
 [testenv]
 deps =