Fixes issue #85: the module can be imported on python 2.7.3 running i…

amqp/__init__.py

@@ -68,10 +68,19 @@
     error_for_code,
     __all__ as _all_exceptions,
 )
+from .utils import promise              # noqa
+
+# Enable celery 3.1.23 to import the package instead of breaking on an
+# unknown symbol
+__all_externals__ = [
+    'promise',
+]
 
 __all__ = [
     'Connection',
     'Channel',
     'Message',
 ]
 __all__ += _all_exceptions
+
+__all__ += __all_externals__

amqp/basic_message.py

@@ -16,15 +16,24 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 from __future__ import absolute_import, unicode_literals
 
-from . import spec
+# Intended to fix #85: ImportError: cannot import name spec
+# Encountered on python 2.7.3
+# "The submodules often need to refer to each other. For example, the
+#  surround [sic] module might use the echo module. In fact, such
+#  references are so common that the import statement first looks in
+#  the containing package before looking in the standard module search
+#  path."
+# Source:
+#   http://stackoverflow.com/a/14216937/4982251
+from .spec import Basic
 from .serialization import GenericContent
 
 __all__ = ['Message']
 
 
 class Message(GenericContent):
     """A Message for use with the Channnel.basic_* methods."""
-    CLASS_ID = spec.Basic.CLASS_ID
+    CLASS_ID = Basic.CLASS_ID
 
     #: Instances of this class have these attributes, which
     #: are passed back and forth as message properties between

amqp/exceptions.py

@@ -254,4 +254,5 @@ def error_for_code(code, text, method, default):
 
 
 for _method_id, _method_name in list(METHOD_NAME_MAP.items()):
-    METHOD_NAME_MAP[unpack('>I', pack('>HH', *_method_id))[0]] = _method_name
+    METHOD_NAME_MAP[unpack(str('>I'), pack(str('>HH'), *_method_id))[0]] = \
+        _method_name

amqp/serialization.py

@@ -30,7 +30,7 @@
 from struct import pack, unpack_from
 from time import mktime
 
-from . import spec
+from .spec import Basic
 from .exceptions import FrameSyntaxError
 from .five import int_types, long_t, string, string_t, items
 from .utils import bytes_to_str as pstr_t, str_to_bytes
@@ -470,7 +470,7 @@ def decode_properties_basic(buf, offset=0,
     return properties, offset
 
 PROPERTY_CLASSES = {
-    spec.Basic.CLASS_ID: decode_properties_basic,
+    Basic.CLASS_ID: decode_properties_basic,
 }
 
 

amqp/utils.py

@@ -3,6 +3,8 @@
 import logging
 import sys
 
+# enables celery 3.1.23 to start again
+from vine import promise                # noqa
 from vine.utils import wraps
 
 from .five import string_t