Merge branch 'master' into readwritereadwrite

Conflicts:
	amqp/transport.py

1 files changed, 8 insertions, 4 deletions

diff --git a/demo/demo_send.py b/demo/demo_send.py
index 0084815..27bb1b1 100755
--- a/demo/demo_send.py
+++ b/demo/demo_send.py
@@ -19,19 +19,23 @@ def main():
     parser = OptionParser(
         usage='usage: %prog [options] message\nexample: %prog hello world',
     )
-    parser.add_option('--host', dest='host',
+    parser.add_option(
+        '--host', dest='host',
         help='AMQP server to connect to (default: %default)',
         default='localhost',
     )
-    parser.add_option('-u', '--userid', dest='userid',
+    parser.add_option(
+        '-u', '--userid', dest='userid',
         help='userid to authenticate as (default: %default)',
         default='guest',
     )
-    parser.add_option('-p', '--password', dest='password',
+    parser.add_option(
+        '-p', '--password', dest='password',
         help='password to authenticate with (default: %default)',
         default='guest',
     )
-    parser.add_option('--ssl', dest='ssl', action='store_true',
+    parser.add_option(
+        '--ssl', dest='ssl', action='store_true',
         help='Enable SSL (default: not enabled)',
         default=False,
     )