Renames Python2/Python3 -> Python 2/Python 3

celery/app/amqp.py

@@ -34,7 +34,7 @@ __all__ = ['AMQP', 'Queues', 'task_message']
 
 PY3 = sys.version_info[0] == 3
 
-# json in Python2.7 borks if dict contains byte keys.
+# json in Python 2.7 borks if dict contains byte keys.
 JSON_NEEDS_UNICODE_KEYS = not PY3 and not try_import('simplejson')
 
 #: Human readable queue declaration.

celery/canvas.py

@@ -36,7 +36,7 @@ __all__ = ['Signature', 'chain', 'xmap', 'xstarmap', 'chunks',
 
 PY3 = sys.version_info[0] == 3
 
-# json in Python2.7 borks if dict contains byte keys.
+# json in Python 2.7 borks if dict contains byte keys.
 JSON_NEEDS_UNICODE_KEYS = PY3 and not try_import('simplejson')
 
 

celery/utils/saferepr.py

@@ -9,7 +9,7 @@
 
     - Sets are represented the Python 3 way: ``{1, 2}`` vs ``set([1, 2])``.
     - Unicode strings does not have the ``u'`` prefix, even on Python 2.
-    - Empty set formatted as ``set()`` (Python3), not ``set([])`` (Python2).
+    - Empty set formatted as ``set()`` (Python 3), not ``set([])`` (Python 2).
     - Longs do not have the ``L`` suffix.
 
     Very slow with no limits, super quick with limits.

celery/utils/timeutils.py

@@ -90,7 +90,7 @@ class LocalTimezone(tzinfo):
 
         def fromutc(self, dt):
             # The base tzinfo class no longer implements a DST
-            # offset aware .fromutc() in Python3 (Issue #2306).
+            # offset aware .fromutc() in Python 3 (Issue #2306).
 
             # I'd rather rely on pytz to do this, than port
             # the C code from cpython's fromutc [asksol]

docs/whatsnew-4.0.rst

@@ -53,12 +53,15 @@ Important Notes
 Dropped support for Python 2.6
 ------------------------------
 
-Celery now requires Python 2.7 or later.
-
-Dropped support for Python 3.3
-------------------------------
-
-Celery now requires Python3 3.4 or later.
+Celery now requires Python 2.7 or later,
+and also drops support for Python 3.3 so supported versions are:
+
+- CPython 2.7
+- CPython 3.4
+- CPython 3.5
+- PyPy 4.0 (pypy2)
+- PyPy 2.4 (pypy3)
+- Jython 2.7.0
 
 JSON is now the default serializer
 ----------------------------------