Merge branch '3.0'

Conflicts:
	celery/contrib/migrate.py
	celery/utils/threads.py

celery/platforms.py

@@ -53,6 +53,12 @@ try:
 except ImportError:  # Py2
     FILENO_ERRORS = (AttributeError, )  # noqa
 
+try:
+    from io import UnsupportedOperation
+    FILENO_ERRORS = (AttributeError, UnsupportedOperation)
+except ImportError:  # Py2
+    FILENO_ERRORS = (AttributeError, )  # noqa
+
 
 def pyimplementation():
     """Returns string identifying the current Python implementation."""

celery/utils/threads.py

@@ -21,6 +21,7 @@ from celery.five import THREAD_TIMEOUT_MAX, items
 
 USE_FAST_LOCALS = os.environ.get('USE_FAST_LOCALS')
 PY3 = sys.version_info[0] == 3
+NEW_EVENT = (sys.version_info[0] == 3) and (sys.version_info[1] >= 3)
 
 
 class bgThread(threading.Thread):