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

celery/security/serialization.py

@@ -8,26 +8,17 @@
 """
 from __future__ import absolute_import
 
-import base64
-
 from kombu.serialization import registry, dumps, loads
 from kombu.utils.encoding import bytes_to_str, str_to_bytes, ensure_bytes
 
 from .certificate import Certificate, FSCertStore
 from .key import PrivateKey
 from .utils import reraise_errors
+from celery.utils.serialization import b64encode, b64decode
 
 __all__ = ['SecureSerializer', 'register_auth']
 
 
-def b64encode(s):
-    return bytes_to_str(base64.b64encode(str_to_bytes(s)))
-
-
-def b64decode(s):
-    return base64.b64decode(str_to_bytes(s))
-
-
 class SecureSerializer(object):
 
     def __init__(self, key=None, cert=None, cert_store=None,

celery/utils/serialization.py

@@ -8,6 +8,7 @@
 """
 from __future__ import absolute_import
 
+from base64 import b64encode as base64encode, b64decode as base64decode
 from inspect import getmro
 from itertools import takewhile
 
@@ -16,6 +17,8 @@ try:
 except ImportError:
     import pickle  # noqa
 
+from kombu.utils.encoding import bytes_to_str, str_to_bytes
+
 from .encoding import safe_repr
 
 __all__ = ['UnpickleableExceptionWrapper', 'subclass_exception',
@@ -165,3 +168,11 @@ def get_pickled_exception(exc):
     if isinstance(exc, UnpickleableExceptionWrapper):
         return exc.restore()
     return exc
+
+
+def b64encode(s):
+    return bytes_to_str(base64encode(str_to_bytes(s)))
+
+
+def b64decode(s):
+    return base64decode(str_to_bytes(s))