From 413ace9274904c6078841ae068348d415a7d5902 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Fri, 6 Nov 2015 12:04:39 -0800
Subject: [PATCH] Renames Python2/Python3 -> Python 2/Python 3

---
 Changelog                     | 10 +++++-----
 docs/reference/kombu.five.rst |  2 +-
 kombu/tests/case.py           |  2 +-
 kombu/transport/qpid.py       |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Changelog b/Changelog
index 7db46a59..8853bc2e 100644
--- a/Changelog
+++ b/Changelog
@@ -769,8 +769,8 @@
 
 - No longer supports Python 2.5
 
-    The minimum Python version supported is now Python 2.6.0 for Python2,
-    and Python 3.3 for Python3.
+    The minimum Python version supported is now Python 2.6.0 for Python 2,
+    and Python 3.3 for Python 3.
 
 - Dual codebase supporting both Python 2 and 3.
 
@@ -944,7 +944,7 @@ ZeroMQ transport: drain_events now supports timeout.
 :release-date: 2013-10-04 03:30 P.M BST
 :release-by: Ask Solem
 
-- Python3: Fixed problem with dependencies not being installed.
+- Python 3: Fixed problem with dependencies not being installed.
 
 .. _version-2.5.15:
 
@@ -1469,9 +1469,9 @@ SQS: Now supports long polling (Issue #176).
 
 - New and better ``repr()`` for Queue and Exchange objects.
 
-- Python3:  Fixed problem with running the unit test suite.
+- Python 3:  Fixed problem with running the unit test suite.
 
-- Python3: Fixed problem with JSON codec.
+- Python 3: Fixed problem with JSON codec.
 
 .. _version-2.4.8:
 
diff --git a/docs/reference/kombu.five.rst b/docs/reference/kombu.five.rst
index 3205cbe0..51898e63 100644
--- a/docs/reference/kombu.five.rst
+++ b/docs/reference/kombu.five.rst
@@ -1,5 +1,5 @@
 ==========================================================
- Python2 to Python3 utilities - kombu.five
+ Python 2 to Python 3 utilities - kombu.five
 ==========================================================
 
 .. contents::
diff --git a/kombu/tests/case.py b/kombu/tests/case.py
index 69d09365..191b018d 100644
--- a/kombu/tests/case.py
+++ b/kombu/tests/case.py
@@ -101,7 +101,7 @@ def case_no_python3(cls):
     @wraps(setup)
     def around_setup(self):
         if PY3:
-            raise SkipTest('Python3 incompatible')
+            raise SkipTest('Python 3 incompatible')
         setup(self)
     cls.setUp = around_setup
     return cls
diff --git a/kombu/transport/qpid.py b/kombu/transport/qpid.py
index 5dcb97d9..35939f61 100644
--- a/kombu/transport/qpid.py
+++ b/kombu/transport/qpid.py
@@ -1500,8 +1500,8 @@ class Transport(base.Transport):
         """Verify that the runtime environment is acceptable.
 
         This method is called as part of __init__ and raises a RuntimeError
-        in Python3 or PyPi environments. This module is not compatible with
-        Python3 or PyPi. The RuntimeError identifies this to the user up
+        in Python 3 or PyPi environments. This module is not compatible with
+        Python 3 or PyPi. The RuntimeError identifies this to the user up
         front along with suggesting Python 2.7 be used instead.
         """
         if getattr(sys, 'pypy_version_info', None):