Ran reindent.py from cpython tools on all python scripts

Citing from reindent docs:

    Change Python (.py) files to use 4-space indents and no hard tab
    characters. Also trim excess spaces and tabs from ends of lines, and
    remove empty lines at the end of files.  Also ensure the last line
    ends with a newline.

Citing from PEP 8:

    Use 4 spaces per indentation level.

    Python 2 code indented with a mixture of tabs and spaces should be
    converted to using spaces exclusively.

    Don't write string literals that rely on significant trailing
    whitespace. Such trailing whitespace is visually indistinguishable
    and some editors (or more recently, reindent.py) will trim them.

Also PyLint recommends not to have trailing whitespace on any line.

plugins/messagebus.py

@@ -22,19 +22,19 @@ session = None
 target = None
 
 def connect_timeout(host, port, timeout):
-  for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
-    af, socktype, proto, canonname, sa = res
-    sock = socket.socket(af, socktype, proto)
-    sock.settimeout(timeout)
-    try:
-      sock.connect(sa)
-      break
-    except socket.error, msg:
-      sock.close()
-  else:
-    # If we got here then we couldn't connect (yet)
-    raise
-  return sock
+    for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
+        af, socktype, proto, canonname, sa = res
+        sock = socket.socket(af, socktype, proto)
+        sock.settimeout(timeout)
+        try:
+            sock.connect(sa)
+            break
+        except socket.error, msg:
+            sock.close()
+    else:
+        # If we got here then we couldn't connect (yet)
+        raise
+    return sock
 
 class tlstimeout(qpid.messaging.transports.tls):
     def __init__(self, conn, host, port):