Removes outdated funtests directory

14 files changed, 23 insertions, 17 deletions

diff --git a/amqp/__init__.py b/amqp/__init__.py
index a4a06cf..24f5960 100644
--- a/amqp/__init__.py
+++ b/amqp/__init__.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 VERSION = (2, 0, 0, 'rc2')
 __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
diff --git a/amqp/abstract_channel.py b/amqp/abstract_channel.py
index 3f96c10..74e74d1 100644
--- a/amqp/abstract_channel.py
+++ b/amqp/abstract_channel.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from vine import ensure_promise, promise
 
diff --git a/amqp/basic_message.py b/amqp/basic_message.py
index 7135d4e..b7921fe 100644
--- a/amqp/basic_message.py
+++ b/amqp/basic_message.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from . import spec
 from .serialization import GenericContent
diff --git a/amqp/channel.py b/amqp/channel.py
index a805324..c89ee1f 100644
--- a/amqp/channel.py
+++ b/amqp/channel.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 import socket
diff --git a/amqp/connection.py b/amqp/connection.py
index 7407aca..f83f386 100644
--- a/amqp/connection.py
+++ b/amqp/connection.py
@@ -14,13 +14,12 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 import socket
 import uuid
 
-from array import array
 from io import BytesIO
 
 from vine import ensure_promise
@@ -34,7 +33,7 @@ from .exceptions import (
     ConnectionForced, ConnectionError, error_for_code,
     RecoverableConnectionError, RecoverableChannelError,
 )
-from .five import range, values, monotonic
+from .five import array, range, values, monotonic
 from .method_framing import frame_handler, frame_writer
 from .serialization import _write_table
 from .transport import Transport
diff --git a/amqp/exceptions.py b/amqp/exceptions.py
index 2975b19..1c27521 100644
--- a/amqp/exceptions.py
+++ b/amqp/exceptions.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from struct import pack, unpack
 
diff --git a/amqp/five.py b/amqp/five.py
index 7d296e6..322d8f3 100644
--- a/amqp/five.py
+++ b/amqp/five.py
@@ -8,7 +8,7 @@
 
 
 """
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import io
 import sys
@@ -32,7 +32,7 @@ except NameError:  # pragma: no cover
 bytes_t = bytes
 
 __all__ = ['Counter', 'reload', 'UserList', 'UserDict',
-           'Queue', 'Empty', 'Full', 'LifoQueue', 'builtins',
+           'Queue', 'Empty', 'Full', 'LifoQueue', 'builtins', 'array',
            'zip_longest', 'map', 'zip', 'string', 'string_t', 'bytes_t',
            'long_t', 'text_t', 'int_types', 'module_name_t',
            'range', 'items', 'keys', 'values', 'nextfun', 'reraise',
@@ -121,6 +121,7 @@ except ImportError:
 if PY3:  # pragma: no cover
     import builtins
 
+    from array import array
     from queue import Queue, Empty, Full, LifoQueue
     from itertools import zip_longest
 
@@ -155,6 +156,7 @@ if PY3:  # pragma: no cover
 
 else:
     import __builtin__ as builtins  # noqa
+    from array import array as _array
     from Queue import Queue, Empty, Full, LifoQueue  # noqa
     from itertools import (               # noqa
         imap as map,
@@ -170,6 +172,11 @@ else:
     module_name_t = str
     int_types = (int, long)
 
+    def array(typecode, *args, **kwargs):
+        if isinstance(typecode, unicode):
+            typecode = typecode.encode()
+        return _array(typecode, *args, **kwargs)
+
     def items(d):                   # noqa
         return d.iteritems()
 
diff --git a/amqp/method_framing.py b/amqp/method_framing.py
index c878af4..debb762 100644
--- a/amqp/method_framing.py
+++ b/amqp/method_framing.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from collections import defaultdict
 from struct import pack, unpack_from, pack_into
diff --git a/amqp/protocol.py b/amqp/protocol.py
index 0856eb4..6e4eec0 100644
--- a/amqp/protocol.py
+++ b/amqp/protocol.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from collections import namedtuple
 
diff --git a/amqp/serialization.py b/amqp/serialization.py
index 971390b..c66b9f7 100644
--- a/amqp/serialization.py
+++ b/amqp/serialization.py
@@ -19,7 +19,7 @@ Convert between bytestreams and higher-level AMQP types.
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import calendar
 import sys
diff --git a/amqp/spec.py b/amqp/spec.py
index 6c5bdf5..4937db4 100644
--- a/amqp/spec.py
+++ b/amqp/spec.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from collections import namedtuple
 
diff --git a/amqp/tests/test_transport.py b/amqp/tests/test_transport.py
index 21fb4bd..6ae7ca4 100644
--- a/amqp/tests/test_transport.py
+++ b/amqp/tests/test_transport.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import errno
 import socket
diff --git a/amqp/transport.py b/amqp/transport.py
index 8993017..0e149bd 100644
--- a/amqp/transport.py
+++ b/amqp/transport.py
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import errno
 import re
diff --git a/amqp/utils.py b/amqp/utils.py
index a1139cd..f5d4341 100644
--- a/amqp/utils.py
+++ b/amqp/utils.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 import sys