Decode the captcha key so it is a string.

fixes #2786

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
(cherry picked from commit 577f47d)

# Conflicts:
#	docs/user/release_notes.rst

bodhi/server/captcha.py

@@ -212,7 +212,7 @@ def generate_captcha(context, request):
     """
     settings = request.registry.settings
     plainkey, value = math_generator(plainkey=None, settings=settings)
-    cipherkey = encrypt(plainkey, settings)
+    cipherkey = encrypt(plainkey, settings).decode('utf8')
     url = request.route_url('captcha_image', cipherkey=cipherkey)
     request.session['captcha'] = cipherkey  # Remember this to stop replay.
     return cipherkey, url

bodhi/tests/server/test_captcha.py

@@ -128,6 +128,7 @@ def test_captcha_can_be_solved(self):
         cipherkey, url = captcha.generate_captcha(None, request)
 
         self.assertEqual(request.session['captcha'], cipherkey)
+        self.assertTrue(isinstance(cipherkey, six.text_type))
         request.route_url.assert_called_once_with('captcha_image', cipherkey=cipherkey)
         self.assertEqual(url, request.route_url.return_value)
         # Let's cheat and find out what the correct value for this cipherkey is and make sure it is

docs/user/release_notes.rst

@@ -23,6 +23,7 @@ Bug fixes
 * Catch ``http.client.IncompleteRead`` while Composing and retry (:issue:`2758`).
 * Correctly handle timestamps from Koji (:issue:`2768`).
 * Do not reverse the logout/reboot options in the web UI on Python 3 (:issue:`2778`).
+* The captcha now works under Python 3 (:issue:`2786`).
 
 
 Contributors