Merge branch '1.0'

Conflicts:
	Changelog
	README.rst
	amqp/__init__.py
	amqp/serialization.py
	amqp/transport.py

2 files changed, 20 insertions, 2 deletions

diff --git a/Changelog b/Changelog
index 14cc7e9..3faa6b2 100644
--- a/Changelog
+++ b/Changelog
@@ -54,6 +54,23 @@ http://code.google.com/p/py-amqplib/source/browse/CHANGES
 
 - Python 3 related fixes.
 
+.. _version-1.0.11:
+
+1.0.11
+======
+:release-date: 2013-04-11 18:00 P.M BST
+
+- Fixed Python 3 incompatibility in ``amqp/transport.py``.
+
+.. _version-1.0.10:
+
+1.0.10
+======
+:release-date: 2013-03-21 03:30 P.M UTC
+
+- Fixed Python 3 incompatibility in ``amqp/serialization.py``.
+  (Issue #11).
+
 .. _version-1.0.9:
 
 1.0.9
diff --git a/amqp/transport.py b/amqp/transport.py
index 6563bd2..0c0d74b 100644
--- a/amqp/transport.py
+++ b/amqp/transport.py
@@ -77,6 +77,7 @@ class _AbstractTransport(object):
                 port = int(port)
 
         self.sock = None
+        last_err = None
         for res in socket.getaddrinfo(host, port, 0,
                                       socket.SOCK_STREAM, SOL_TCP):
             af, socktype, proto, canonname, sa = res
@@ -88,13 +89,13 @@ class _AbstractTransport(object):
                 msg = exc
                 self.sock.close()
                 self.sock = None
+                last_err = msg
                 continue
             break
 
         if not self.sock:
             # Didn't connect, return the most recent error message
-            msg = msg or 'getaddrinfo() for {0} is empty list'.format(host)
-            raise socket.error(msg)
+            raise socket.error(last_err)
 
         self.sock.settimeout(None)
         self.sock.setsockopt(SOL_TCP, socket.TCP_NODELAY, 1)