Merge branch 'master' of github.com:celery/celery

celery/utils/term.py

@@ -172,7 +172,8 @@ def supports_images():
 
 def _read_as_base64(path):
     with codecs.open(path, mode='rb') as fh:
-        return base64.b64encode(fh.read())
+        encoded = base64.b64encode(fh.read())
+        return encoded if type(encoded) == 'str' else encoded.decode('ascii')
 
 
 def imgcat(path, inline=1, preserve_aspect_ratio=0, **kwargs):

docs/getting-started/brokers/redis.rst

@@ -15,7 +15,7 @@ the ``celery[redis]`` :ref:`bundle <bundles>`:
 
 .. code-block:: console
 
-    $ pip install -U celery[redis]
+    $ pip install -U "celery[redis]"
 
 .. _broker-redis-configuration: