diff --git a/coolamqp/attaches/consumer.py b/coolamqp/attaches/consumer.py
index e62f99c9b6357b23ce179ab150f6b22f3003daf1..2cd7b370795f9fe6f829dd5df79377025c56919e 100644
--- a/coolamqp/attaches/consumer.py
+++ b/coolamqp/attaches/consumer.py
@@ -129,7 +129,7 @@ class Consumer(Channeler):
 
         # private
         self.cancelled = False  # did the client want to STOP using this
-                                # consumer?
+        # consumer?
         self.receiver = None  # MessageReceiver instance
 
         self.attache_group = None  # attache group this belongs to.
diff --git a/coolamqp/attaches/publisher.py b/coolamqp/attaches/publisher.py
index 6d480f5b1df3a0d8daef9436b00f949959bc3c14..0b4d7c059270b9ac5962c2386740a367cfe7067a 100644
--- a/coolamqp/attaches/publisher.py
+++ b/coolamqp/attaches/publisher.py
@@ -234,8 +234,8 @@ class Publisher(Channeler, Synchronized):
     def on_operational(self, operational):
         state = {True: u'up', False: u'down'}[operational]
         mode = \
-        {Publisher.MODE_NOACK: u'noack', Publisher.MODE_CNPUB: u'cnpub'}[
-            self.mode]
+            {Publisher.MODE_NOACK: u'noack', Publisher.MODE_CNPUB: u'cnpub'}[
+                self.mode]
 
         logger.info('Publisher %s is %s', mode, state)
 
diff --git a/coolamqp/exceptions.py b/coolamqp/exceptions.py
index 0e4fcf979e6e04ac09021ac53df46a51a672c3f3..e3024f7a7611806a1b0ded85e27f22350336d5cc 100644
--- a/coolamqp/exceptions.py
+++ b/coolamqp/exceptions.py
@@ -28,8 +28,9 @@ class AMQPError(CoolAMQPError):
         return 'AMQP error %s: %s' % (self.reply_code, self.reply_text)
 
     def __repr__(self):
-        return 'AMQPError('+repr(self.reply_code)+', '+repr(self.reply_text)+ \
-                ', '+repr(self.class_id)+', '+repr(self.method_id)+')'
+        return 'AMQPError(' + repr(self.reply_code) + ', ' + repr(
+            self.reply_text) + \
+               ', ' + repr(self.class_id) + ', ' + repr(self.method_id) + ')'
 
     def __init__(self, *args):
         """
diff --git a/coolamqp/framing/compilation/utilities.py b/coolamqp/framing/compilation/utilities.py
index 8c333b32db655dfaed005fa87954bcba4ee53bf2..fb0d3acdcd2da8da2e6bcc10575247ab8405624a 100644
--- a/coolamqp/framing/compilation/utilities.py
+++ b/coolamqp/framing/compilation/utilities.py
@@ -9,6 +9,7 @@ from coolamqp.framing.base import BASIC_TYPES
 
 from .xml_tags import *
 
+
 # docs may be None
 
 
@@ -39,7 +40,6 @@ def get_size(fields):  # assume all fields have static length
     return size
 
 
-
 def as_unicode(callable):
     def roll(*args, **kwargs):
         return six.text_type(callable(*args, **kwargs))
diff --git a/coolamqp/framing/compilation/xml_fields.py b/coolamqp/framing/compilation/xml_fields.py
index 794973f7ee226d16e65183ced558df16e8d2546a..2ef977dd19a98b2fb6ece1e8563346862b56da09 100644
--- a/coolamqp/framing/compilation/xml_fields.py
+++ b/coolamqp/framing/compilation/xml_fields.py
@@ -7,17 +7,21 @@ import logging
 class _Required(object):
     """Only a placeholder to tell apart None default values from required fields"""
 
+
 def nop(x):
     return x
 
+
 def _get_tagchild(elem, tag):
     return [e for e in elem.getchildren() if e.tag == tag]
 
+
 __all__ = [
     '_name', '_docs', '_ComputedField', '_ValueField', '_SimpleField',
     '_docs_with_label', '_get_tagchild', '_ChildField'
 ]
 
+
 class _Field(object):
     """Base field object"""
 
@@ -36,6 +40,7 @@ class _ComputedField(_Field):
     There's no corresponding XML attribute name - value must
     be computed from element
     """
+
     def __init__(self, field_name, find_fun):
         super(_ComputedField, self).__init__(field_name)
         self.find = find_fun
@@ -46,10 +51,11 @@ class _ValueField(_Field):
     Can hide under a pick of different XML attribute names.
     Has a type, can have a default value.
     """
+
     def __init__(self, xml_names, field_name, field_type=nop,
                  default=_Required):
         if not isinstance(xml_names, tuple):
-            xml_names = (xml_names, )
+            xml_names = (xml_names,)
         self.xml_names = xml_names
         assert field_type is not None
         self.field_name = field_name
@@ -66,24 +72,25 @@ class _ValueField(_Field):
             return elem.attrib[xmln[0]]
         else:
             if self.default is _Required:
-                raise TypeError('Did not find field %s in elem tag %s, looked for names %s' % (self.field_name, elem.tag, self.xml_names))
+                raise TypeError(
+                    'Did not find field %s in elem tag %s, looked for names %s' % (
+                    self.field_name, elem.tag, self.xml_names))
             else:
                 return self.default
 
 
 class _SimpleField(_ValueField):
     """XML attribute is the same as name, has a type and can be default"""
+
     def __init__(self, name, field_type=nop, default=_Required):
         super(_SimpleField, self).__init__(name, name, field_type, default)
 
 
-
-
-
 class _ChildField(_ComputedField):
     """
     List of other properties
     """
+
     def __init__(self, name, xml_tag, fun, postexec=nop):
         super(_ChildField, self).__init__(name, lambda elem: \
             postexec([fun(c) for c in _get_tagchild(elem, xml_tag)]))
@@ -102,8 +109,7 @@ def get_docs(elem, label):
     if label:
         return elem.attrib.get('label', None)
 
+
 _name = _SimpleField('name', six.text_type)
 _docs = _ComputedField('docs', lambda elem: get_docs(elem, False))
 _docs_with_label = _ComputedField('docs', lambda elem: get_docs(elem, True))
-
-
diff --git a/coolamqp/framing/compilation/xml_tags.py b/coolamqp/framing/compilation/xml_tags.py
index 5c98e58d1922f8f45ff49bbe87f96f98d1725857..9dde0e4e8856db8161501ed93f3d577ee9d7461d 100644
--- a/coolamqp/framing/compilation/xml_tags.py
+++ b/coolamqp/framing/compilation/xml_tags.py
@@ -13,14 +13,15 @@ logger = logging.getLogger(__name__)
 def _boolint(x):
     return bool(int(x))
 
+
 __all__ = [
     'Domain', 'Method', 'Class', 'Field', 'Constant'
 ]
 
 
 class BaseObject(object):
-
     FIELDS = []
+
     # tuples of (xml name, field name, type, (optional) default value)
 
     def __init__(self, elem):
@@ -36,6 +37,7 @@ class BaseObject(object):
         c.__dict__.update(**kwargs)
         return c
 
+
 class Constant(BaseObject):
     NAME = 'constant'
     FIELDS = [
@@ -45,6 +47,7 @@ class Constant(BaseObject):
         _docs,
     ]
 
+
 class Field(BaseObject):
     NAME = 'field'
     FIELDS = [
@@ -52,7 +55,9 @@ class Field(BaseObject):
         _ValueField(('domain', 'type'), 'type', str),
         _SimpleField('label', default=None),
         _SimpleField('reserved', _boolint, default=0),
-        _ComputedField('basic_type', lambda elem: elem.attrib.get('type', '') == elem.attrib.get('name', '')),
+        _ComputedField('basic_type', lambda elem: elem.attrib.get('type',
+                                                                  '') == elem.attrib.get(
+            'name', '')),
         _docs
     ]
 
@@ -62,12 +67,11 @@ class Domain(BaseObject):
     FIELDS = [
         _name,
         _SimpleField('type'),
-        _ComputedField('elementary', lambda a: a.attrib['type'] == a.attrib['name'])
+        _ComputedField('elementary',
+                       lambda a: a.attrib['type'] == a.attrib['name'])
     ]
 
 
-
-
 class Method(BaseObject):
     NAME = 'method'
     FIELDS = [
@@ -78,12 +82,16 @@ class Method(BaseObject):
         _docs,
         _ChildField('fields', 'field', Field),
         _ChildField('response', 'response', lambda e: e.attrib['name']),
-        _ChildField('sent_by_client', 'chassis', lambda e: e.attrib.get('name', '') == 'client', postexec=any),
-        _ChildField('sent_by_server', 'chassis', lambda e: e.attrib.get('name', '') == 'server', postexec=any),
-        _ChildField('constant', 'field', lambda e: Field(e).reserved, postexec=all)
+        _ChildField('sent_by_client', 'chassis',
+                    lambda e: e.attrib.get('name', '') == 'client',
+                    postexec=any),
+        _ChildField('sent_by_server', 'chassis',
+                    lambda e: e.attrib.get('name', '') == 'server',
+                    postexec=any),
+        _ChildField('constant', 'field', lambda e: Field(e).reserved,
+                    postexec=all)
     ]
 
-
     def get_static_body(self):  # only arguments part
         body = []
         bits = 0
@@ -100,12 +108,14 @@ class Method(BaseObject):
         return b''.join(body)
 
     def is_static(self, domain_to_type=None):  # is size constant?
-        return not any(field.basic_type in DYNAMIC_BASIC_TYPES for field in self.fields)
+        return not any(
+            field.basic_type in DYNAMIC_BASIC_TYPES for field in self.fields)
 
 
 _cls_method_sortkey = lambda m: (m.name.strip('-')[0], -len(m.response))
 _cls_method_postexec = lambda q: sorted(q, key=_cls_method_sortkey)
 
+
 class Class(BaseObject):
     NAME = 'class'
     FIELDS = [
@@ -116,4 +126,3 @@ class Class(BaseObject):
             _cls_method_postexec),
         _ChildField('properties', 'field', Field)
     ]
-
diff --git a/coolamqp/framing/definitions.py b/coolamqp/framing/definitions.py
index 61233a9ce4cc672eee6baa8bf00c7ae728db8e9e..e59f19138f7e75d53c46dc23d246218b1505fbd4 100644
--- a/coolamqp/framing/definitions.py
+++ b/coolamqp/framing/definitions.py
@@ -1,5 +1,6 @@
 # coding=UTF-8
 from __future__ import print_function, absolute_import
+
 """
 A Python version of the AMQP machine-readable specification.
 
@@ -25,13 +26,17 @@ Only thing that isn't are field names in tables.
 
 import struct, collections, logging, six
 
-from coolamqp.framing.base import AMQPClass, AMQPMethodPayload, AMQPContentPropertyList
-from coolamqp.framing.field_table import enframe_table, deframe_table, frame_table_size
-from coolamqp.framing.compilation.content_property import compile_particular_content_property_list_class
+from coolamqp.framing.base import AMQPClass, AMQPMethodPayload, \
+    AMQPContentPropertyList
+from coolamqp.framing.field_table import enframe_table, deframe_table, \
+    frame_table_size
+from coolamqp.framing.compilation.content_property import \
+    compile_particular_content_property_list_class
 
 logger = logging.getLogger(__name__)
 
-Field = collections.namedtuple('Field', ('name', 'type', 'basic_type', 'reserved'))
+Field = collections.namedtuple('Field',
+                               ('name', 'type', 'basic_type', 'reserved'))
 
 # Core constants
 FRAME_METHOD = 1
@@ -53,86 +58,88 @@ FRAME_END_BYTE = b'\xce'
 
 REPLY_SUCCESS = 200
 REPLY_SUCCESS_BYTE = b'\xc8'
- # Indicates that the method completed successfully. This reply code is
-                              # reserved for future use - the current protocol design does not use
-                              # positive
-                              # confirmation and reply codes are sent only in case of an error.
+# Indicates that the method completed successfully. This reply code is
+# reserved for future use - the current protocol design does not use
+# positive
+# confirmation and reply codes are sent only in case of an error.
 CONTENT_TOO_LARGE = 311
- # The client attempted to transfer content larger than the server
-                         # could accept
-                         # at the present time. The client may retry at a later time.
+# The client attempted to transfer content larger than the server
+# could accept
+# at the present time. The client may retry at a later time.
 NO_CONSUMERS = 313
- # When the exchange cannot deliver to a consumer when the immediate
-                    # flag is
-                    # set. As a result of pending data on the queue or the absence of any
-                    # consumers of the queue.
+# When the exchange cannot deliver to a consumer when the immediate
+# flag is
+# set. As a result of pending data on the queue or the absence of any
+# consumers of the queue.
 CONNECTION_FORCED = 320
- # An operator intervened to close the connection for some reason. The
-                         # client
-                         # may retry at some later date.
+# An operator intervened to close the connection for some reason. The
+# client
+# may retry at some later date.
 INVALID_PATH = 402
- # The client tried to work with an unknown virtual host.
+# The client tried to work with an unknown virtual host.
 ACCESS_REFUSED = 403
- # The client attempted to work with a server entity to which it has no
-                      # access due to security settings.
+# The client attempted to work with a server entity to which it has no
+# access due to security settings.
 NOT_FOUND = 404
- # The client attempted to work with a server entity that does not
-                 # exist.
+# The client attempted to work with a server entity that does not
+# exist.
 RESOURCE_LOCKED = 405
- # The client attempted to work with a server entity to which it has no
-                       # access because another client is working with it.
+# The client attempted to work with a server entity to which it has no
+# access because another client is working with it.
 PRECONDITION_FAILED = 406
- # The client requested a method that was not allowed because some
-                           # precondition
-                           # failed.
+# The client requested a method that was not allowed because some
+# precondition
+# failed.
 FRAME_ERROR = 501
- # The sender sent a malformed frame that the recipient could not
-                   # decode.
-                   # This strongly implies a programming error in the sending peer.
+# The sender sent a malformed frame that the recipient could not
+# decode.
+# This strongly implies a programming error in the sending peer.
 SYNTAX_ERROR = 502
- # The sender sent a frame that contained illegal values for one or
-                    # more
-                    # fields. This strongly implies a programming error in the sending
-                    # peer.
+# The sender sent a frame that contained illegal values for one or
+# more
+# fields. This strongly implies a programming error in the sending
+# peer.
 COMMAND_INVALID = 503
- # The client sent an invalid sequence of frames, attempting to perform
-                       # an
-                       # operation that was considered invalid by the server. This usually
-                       # implies
-                       # a programming error in the client.
+# The client sent an invalid sequence of frames, attempting to perform
+# an
+# operation that was considered invalid by the server. This usually
+# implies
+# a programming error in the client.
 CHANNEL_ERROR = 504
- # The client attempted to work with a channel that had not been
-                     # correctly
-                     # opened. This most likely indicates a fault in the client layer.
+# The client attempted to work with a channel that had not been
+# correctly
+# opened. This most likely indicates a fault in the client layer.
 UNEXPECTED_FRAME = 505
- # The peer sent a frame that was not expected, usually in the context
-                        # of
-                        # a content header and body. This strongly indicates a fault in the
-                        # peer's
-                        # content processing.
+# The peer sent a frame that was not expected, usually in the context
+# of
+# a content header and body. This strongly indicates a fault in the
+# peer's
+# content processing.
 RESOURCE_ERROR = 506
- # The server could not complete the method because it lacked
-                      # sufficient
-                      # resources. This may be due to the client creating too many of some
-                      # type
-                      # of entity.
+# The server could not complete the method because it lacked
+# sufficient
+# resources. This may be due to the client creating too many of some
+# type
+# of entity.
 NOT_ALLOWED = 530
- # The client tried to work with some entity in a manner that is
-                   # prohibited
-                   # by the server, due to security settings or by some other criteria.
+# The client tried to work with some entity in a manner that is
+# prohibited
+# by the server, due to security settings or by some other criteria.
 NOT_IMPLEMENTED = 540
- # The client tried to use functionality that is not implemented in the
-                       # server.
+# The client tried to use functionality that is not implemented in the
+# server.
 INTERNAL_ERROR = 541
- # The server could not complete the method because of an internal
-                      # error.
-                      # The server may require intervention by an operator in order to
-                      # resume
-                      # normal operations.
-
-HARD_ERRORS = [CONNECTION_FORCED, INVALID_PATH, FRAME_ERROR, SYNTAX_ERROR, COMMAND_INVALID, CHANNEL_ERROR, UNEXPECTED_FRAME, RESOURCE_ERROR, NOT_ALLOWED, NOT_IMPLEMENTED, INTERNAL_ERROR]
-SOFT_ERRORS = [CONTENT_TOO_LARGE, NO_CONSUMERS, ACCESS_REFUSED, NOT_FOUND, RESOURCE_LOCKED, PRECONDITION_FAILED]
-
+# The server could not complete the method because of an internal
+# error.
+# The server may require intervention by an operator in order to
+# resume
+# normal operations.
+
+HARD_ERRORS = [CONNECTION_FORCED, INVALID_PATH, FRAME_ERROR, SYNTAX_ERROR,
+               COMMAND_INVALID, CHANNEL_ERROR, UNEXPECTED_FRAME,
+               RESOURCE_ERROR, NOT_ALLOWED, NOT_IMPLEMENTED, INTERNAL_ERROR]
+SOFT_ERRORS = [CONTENT_TOO_LARGE, NO_CONSUMERS, ACCESS_REFUSED, NOT_FOUND,
+               RESOURCE_LOCKED, PRECONDITION_FAILED]
 
 DOMAIN_TO_BASIC_TYPE = {
     u'class-id': u'short',
@@ -161,6 +168,7 @@ DOMAIN_TO_BASIC_TYPE = {
     u'table': None,
 }
 
+
 class Connection(AMQPClass):
     """
     The connection class provides methods for a client to establish a
@@ -178,20 +186,20 @@ class ConnectionBlocked(AMQPMethodPayload):
     
     and does not accept new publishes.
     """
-    __slots__ = (u'reason', )
+    __slots__ = (u'reason',)
 
     NAME = u'connection.blocked'
 
-    INDEX = (10, 60)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x3C'      # CLASS ID + METHOD ID
+    INDEX = (10, 60)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x3C'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reason', u'shortstr', u'shortstr', reserved=False),
     ]
 
@@ -206,7 +214,7 @@ class ConnectionBlocked(AMQPMethodPayload):
     def write_arguments(self, buf):
         buf.write(struct.pack('!B', len(self.reason)))
         buf.write(self.reason)
-        
+
     def get_size(self):
         return 1 + len(self.reason)
 
@@ -215,7 +223,7 @@ class ConnectionBlocked(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        reason = buf[offset:offset+s_len]
+        reason = buf[offset:offset + s_len]
         offset += s_len
         return ConnectionBlocked(reason)
 
@@ -233,20 +241,20 @@ class ConnectionClose(AMQPMethodPayload):
     sender provides the class and method id of the method which
     caused the exception.
     """
-    __slots__ = (u'reply_code', u'reply_text', u'class_id', u'method_id', )
+    __slots__ = (u'reply_code', u'reply_text', u'class_id', u'method_id',)
 
     NAME = u'connection.close'
 
-    INDEX = (10, 50)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x32'      # CLASS ID + METHOD ID
+    INDEX = (10, 50)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x32'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reply-code', u'reply-code', u'short', reserved=False),
         Field(u'reply-text', u'reply-text', u'shortstr', reserved=False),
         Field(u'class-id', u'class-id', u'short', reserved=False),
@@ -278,7 +286,7 @@ class ConnectionClose(AMQPMethodPayload):
         buf.write(struct.pack('!HB', self.reply_code, len(self.reply_text)))
         buf.write(self.reply_text)
         buf.write(struct.pack('!HH', self.class_id, self.method_id))
-        
+
     def get_size(self):
         return 7 + len(self.reply_text)
 
@@ -287,7 +295,7 @@ class ConnectionClose(AMQPMethodPayload):
         offset = start_offset
         reply_code, s_len, = struct.unpack_from('!HB', buf, offset)
         offset += 3
-        reply_text = buf[offset:offset+s_len]
+        reply_text = buf[offset:offset + s_len]
         offset += s_len
         class_id, method_id, = struct.unpack_from('!HH', buf, offset)
         offset += 4
@@ -307,12 +315,12 @@ class ConnectionCloseOk(AMQPMethodPayload):
 
     NAME = u'connection.close-ok'
 
-    INDEX = (10, 51)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x33'      # CLASS ID + METHOD ID
+    INDEX = (10, 51)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x33'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x0A\x00\x33\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -321,7 +329,6 @@ class ConnectionCloseOk(AMQPMethodPayload):
         Create frame connection.close-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -341,20 +348,20 @@ class ConnectionOpen(AMQPMethodPayload):
     of each type of entity that may be used, per connection and/or
     in total.
     """
-    __slots__ = (u'virtual_host', )
+    __slots__ = (u'virtual_host',)
 
     NAME = u'connection.open'
 
-    INDEX = (10, 40)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x28'      # CLASS ID + METHOD ID
+    INDEX = (10, 40)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x28'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'virtual-host', u'path', u'shortstr', reserved=False),
         Field(u'reserved-1', u'shortstr', u'shortstr', reserved=True),
         Field(u'reserved-2', u'bit', u'bit', reserved=True),
@@ -375,7 +382,7 @@ class ConnectionOpen(AMQPMethodPayload):
         buf.write(self.virtual_host)
         buf.write(b'\x00')
         buf.write(struct.pack('!B', 0))
-        
+
     def get_size(self):
         return 3 + len(self.virtual_host)
 
@@ -384,11 +391,11 @@ class ConnectionOpen(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        virtual_host = buf[offset:offset+s_len]
+        virtual_host = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        offset += s_len # reserved field!
+        offset += s_len  # reserved field!
         offset += 1
         return ConnectionOpen(virtual_host)
 
@@ -404,17 +411,17 @@ class ConnectionOpenOk(AMQPMethodPayload):
 
     NAME = u'connection.open-ok'
 
-    INDEX = (10, 41)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x29'      # CLASS ID + METHOD ID
+    INDEX = (10, 41)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x29'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x0A\x00\x29\x00\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'shortstr', u'shortstr', reserved=True),
     ]
 
@@ -423,13 +430,12 @@ class ConnectionOpenOk(AMQPMethodPayload):
         Create frame connection.open-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        offset += s_len # reserved field!
+        offset += s_len  # reserved field!
         return ConnectionOpenOk()
 
 
@@ -443,28 +449,32 @@ class ConnectionStart(AMQPMethodPayload):
     security mechanisms
     which the client can use for authentication.
     """
-    __slots__ = (u'version_major', u'version_minor', u'server_properties', u'mechanisms', u'locales', )
+    __slots__ = (
+    u'version_major', u'version_minor', u'server_properties', u'mechanisms',
+    u'locales',)
 
     NAME = u'connection.start'
 
-    INDEX = (10, 10)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x0A'      # CLASS ID + METHOD ID
+    INDEX = (10, 10)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x0A'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'version-major', u'octet', u'octet', reserved=False),
         Field(u'version-minor', u'octet', u'octet', reserved=False),
-        Field(u'server-properties', u'peer-properties', u'table', reserved=False),
+        Field(u'server-properties', u'peer-properties', u'table',
+              reserved=False),
         Field(u'mechanisms', u'longstr', u'longstr', reserved=False),
         Field(u'locales', u'longstr', u'longstr', reserved=False),
     ]
 
-    def __init__(self, version_major, version_minor, server_properties, mechanisms, locales):
+    def __init__(self, version_major, version_minor, server_properties,
+                 mechanisms, locales):
         """
         Create frame connection.start
 
@@ -513,9 +523,10 @@ class ConnectionStart(AMQPMethodPayload):
         buf.write(self.mechanisms)
         buf.write(struct.pack('!I', len(self.locales)))
         buf.write(self.locales)
-        
+
     def get_size(self):
-        return 10 + frame_table_size(self.server_properties) + len(self.mechanisms) + len(self.locales)
+        return 10 + frame_table_size(self.server_properties) + len(
+            self.mechanisms) + len(self.locales)
 
     @staticmethod
     def from_buffer(buf, start_offset):
@@ -526,13 +537,14 @@ class ConnectionStart(AMQPMethodPayload):
         offset += delta
         s_len, = struct.unpack_from('!L', buf, offset)
         offset += 4
-        mechanisms = buf[offset:offset+s_len]
+        mechanisms = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!L', buf, offset)
         offset += 4
-        locales = buf[offset:offset+s_len]
+        locales = buf[offset:offset + s_len]
         offset += s_len
-        return ConnectionStart(version_major, version_minor, server_properties, mechanisms, locales)
+        return ConnectionStart(version_major, version_minor, server_properties,
+                               mechanisms, locales)
 
 
 class ConnectionSecure(AMQPMethodPayload):
@@ -545,20 +557,20 @@ class ConnectionSecure(AMQPMethodPayload):
     method challenges
     the client to provide more information.
     """
-    __slots__ = (u'challenge', )
+    __slots__ = (u'challenge',)
 
     NAME = u'connection.secure'
 
-    INDEX = (10, 20)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x14'      # CLASS ID + METHOD ID
+    INDEX = (10, 20)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x14'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'challenge', u'longstr', u'longstr', reserved=False),
     ]
 
@@ -577,7 +589,7 @@ class ConnectionSecure(AMQPMethodPayload):
     def write_arguments(self, buf):
         buf.write(struct.pack('!I', len(self.challenge)))
         buf.write(self.challenge)
-        
+
     def get_size(self):
         return 4 + len(self.challenge)
 
@@ -586,7 +598,7 @@ class ConnectionSecure(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!L', buf, offset)
         offset += 4
-        challenge = buf[offset:offset+s_len]
+        challenge = buf[offset:offset + s_len]
         offset += s_len
         return ConnectionSecure(challenge)
 
@@ -597,21 +609,22 @@ class ConnectionStartOk(AMQPMethodPayload):
     
     This method selects a SASL security mechanism.
     """
-    __slots__ = (u'client_properties', u'mechanism', u'response', u'locale', )
+    __slots__ = (u'client_properties', u'mechanism', u'response', u'locale',)
 
     NAME = u'connection.start-ok'
 
-    INDEX = (10, 11)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x0B'      # CLASS ID + METHOD ID
+    INDEX = (10, 11)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x0B'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
-        Field(u'client-properties', u'peer-properties', u'table', reserved=False),
+    FIELDS = [
+        Field(u'client-properties', u'peer-properties', u'table',
+              reserved=False),
         Field(u'mechanism', u'shortstr', u'shortstr', reserved=False),
         Field(u'response', u'longstr', u'longstr', reserved=False),
         Field(u'locale', u'shortstr', u'shortstr', reserved=False),
@@ -659,9 +672,10 @@ class ConnectionStartOk(AMQPMethodPayload):
         buf.write(self.response)
         buf.write(struct.pack('!B', len(self.locale)))
         buf.write(self.locale)
-        
+
     def get_size(self):
-        return 6 + frame_table_size(self.client_properties) + len(self.mechanism) + len(self.response) + len(self.locale)
+        return 6 + frame_table_size(self.client_properties) + len(
+            self.mechanism) + len(self.response) + len(self.locale)
 
     @staticmethod
     def from_buffer(buf, start_offset):
@@ -670,17 +684,18 @@ class ConnectionStartOk(AMQPMethodPayload):
         offset += delta
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        mechanism = buf[offset:offset+s_len]
+        mechanism = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!L', buf, offset)
         offset += 4
-        response = buf[offset:offset+s_len]
+        response = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        locale = buf[offset:offset+s_len]
+        locale = buf[offset:offset + s_len]
         offset += s_len
-        return ConnectionStartOk(client_properties, mechanism, response, locale)
+        return ConnectionStartOk(client_properties, mechanism, response,
+                                 locale)
 
 
 class ConnectionSecureOk(AMQPMethodPayload):
@@ -691,20 +706,20 @@ class ConnectionSecureOk(AMQPMethodPayload):
     data for the security
     mechanism at the server side.
     """
-    __slots__ = (u'response', )
+    __slots__ = (u'response',)
 
     NAME = u'connection.secure-ok'
 
-    INDEX = (10, 21)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x15'      # CLASS ID + METHOD ID
+    INDEX = (10, 21)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x15'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'response', u'longstr', u'longstr', reserved=False),
     ]
 
@@ -723,7 +738,7 @@ class ConnectionSecureOk(AMQPMethodPayload):
     def write_arguments(self, buf):
         buf.write(struct.pack('!I', len(self.response)))
         buf.write(self.response)
-        
+
     def get_size(self):
         return 4 + len(self.response)
 
@@ -732,7 +747,7 @@ class ConnectionSecureOk(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!L', buf, offset)
         offset += 4
-        response = buf[offset:offset+s_len]
+        response = buf[offset:offset + s_len]
         offset += s_len
         return ConnectionSecureOk(response)
 
@@ -745,20 +760,20 @@ class ConnectionTune(AMQPMethodPayload):
     the client. The
     client can accept and/or adjust these.
     """
-    __slots__ = (u'channel_max', u'frame_max', u'heartbeat', )
+    __slots__ = (u'channel_max', u'frame_max', u'heartbeat',)
 
     NAME = u'connection.tune'
 
-    INDEX = (10, 30)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x1E'      # CLASS ID + METHOD ID
+    INDEX = (10, 30)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x1E'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'channel-max', u'short', u'short', reserved=False),
         Field(u'frame-max', u'long', u'long', reserved=False),
         Field(u'heartbeat', u'short', u'short', reserved=False),
@@ -794,15 +809,17 @@ class ConnectionTune(AMQPMethodPayload):
         self.heartbeat = heartbeat
 
     def write_arguments(self, buf):
-        buf.write(struct.pack('!HIH', self.channel_max, self.frame_max, self.heartbeat))
-        
+        buf.write(struct.pack('!HIH', self.channel_max, self.frame_max,
+                              self.heartbeat))
+
     def get_size(self):
         return 8
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
-        channel_max, frame_max, heartbeat, = struct.unpack_from('!HIH', buf, offset)
+        channel_max, frame_max, heartbeat, = struct.unpack_from('!HIH', buf,
+                                                                offset)
         offset += 8
         return ConnectionTune(channel_max, frame_max, heartbeat)
 
@@ -816,20 +833,20 @@ class ConnectionTuneOk(AMQPMethodPayload):
     Certain fields are negotiated, others provide capability
     information.
     """
-    __slots__ = (u'channel_max', u'frame_max', u'heartbeat', )
+    __slots__ = (u'channel_max', u'frame_max', u'heartbeat',)
 
     NAME = u'connection.tune-ok'
 
-    INDEX = (10, 31)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x1F'      # CLASS ID + METHOD ID
+    INDEX = (10, 31)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x1F'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'channel-max', u'short', u'short', reserved=False),
         Field(u'frame-max', u'long', u'long', reserved=False),
         Field(u'heartbeat', u'short', u'short', reserved=False),
@@ -865,15 +882,17 @@ class ConnectionTuneOk(AMQPMethodPayload):
         self.heartbeat = heartbeat
 
     def write_arguments(self, buf):
-        buf.write(struct.pack('!HIH', self.channel_max, self.frame_max, self.heartbeat))
-        
+        buf.write(struct.pack('!HIH', self.channel_max, self.frame_max,
+                              self.heartbeat))
+
     def get_size(self):
         return 8
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
-        channel_max, frame_max, heartbeat, = struct.unpack_from('!HIH', buf, offset)
+        channel_max, frame_max, heartbeat, = struct.unpack_from('!HIH', buf,
+                                                                offset)
         offset += 8
         return ConnectionTuneOk(channel_max, frame_max, heartbeat)
 
@@ -888,12 +907,12 @@ class ConnectionUnblocked(AMQPMethodPayload):
 
     NAME = u'connection.unblocked'
 
-    INDEX = (10, 61)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x0A\x00\x3D'      # CLASS ID + METHOD ID
+    INDEX = (10, 61)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x0A\x00\x3D'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x0A\x00\x3D\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -902,7 +921,6 @@ class ConnectionUnblocked(AMQPMethodPayload):
         Create frame connection.unblocked
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -933,20 +951,20 @@ class ChannelClose(AMQPMethodPayload):
     the class and method id of the method which caused the
     exception.
     """
-    __slots__ = (u'reply_code', u'reply_text', u'class_id', u'method_id', )
+    __slots__ = (u'reply_code', u'reply_text', u'class_id', u'method_id',)
 
     NAME = u'channel.close'
 
-    INDEX = (20, 40)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x14\x00\x28'      # CLASS ID + METHOD ID
+    INDEX = (20, 40)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x14\x00\x28'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reply-code', u'reply-code', u'short', reserved=False),
         Field(u'reply-text', u'reply-text', u'shortstr', reserved=False),
         Field(u'class-id', u'class-id', u'short', reserved=False),
@@ -978,7 +996,7 @@ class ChannelClose(AMQPMethodPayload):
         buf.write(struct.pack('!HB', self.reply_code, len(self.reply_text)))
         buf.write(self.reply_text)
         buf.write(struct.pack('!HH', self.class_id, self.method_id))
-        
+
     def get_size(self):
         return 7 + len(self.reply_text)
 
@@ -987,7 +1005,7 @@ class ChannelClose(AMQPMethodPayload):
         offset = start_offset
         reply_code, s_len, = struct.unpack_from('!HB', buf, offset)
         offset += 3
-        reply_text = buf[offset:offset+s_len]
+        reply_text = buf[offset:offset + s_len]
         offset += s_len
         class_id, method_id, = struct.unpack_from('!HH', buf, offset)
         offset += 4
@@ -1006,12 +1024,12 @@ class ChannelCloseOk(AMQPMethodPayload):
 
     NAME = u'channel.close-ok'
 
-    INDEX = (20, 41)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x14\x00\x29'      # CLASS ID + METHOD ID
+    INDEX = (20, 41)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x14\x00\x29'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x14\x00\x29\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -1020,7 +1038,6 @@ class ChannelCloseOk(AMQPMethodPayload):
         Create frame channel.close-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -1041,20 +1058,20 @@ class ChannelFlow(AMQPMethodPayload):
     control. It does
     not affect contents returned by Basic.Get-Ok methods.
     """
-    __slots__ = (u'active', )
+    __slots__ = (u'active',)
 
     NAME = u'channel.flow'
 
-    INDEX = (20, 20)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x14\x00\x14'      # CLASS ID + METHOD ID
+    INDEX = (20, 20)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x14\x00\x14'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'active', u'bit', u'bit', reserved=False),
     ]
 
@@ -1072,7 +1089,7 @@ class ChannelFlow(AMQPMethodPayload):
 
     def write_arguments(self, buf):
         buf.write(struct.pack('!B', (self.active << 0)))
-        
+
     def get_size(self):
         return 1
 
@@ -1093,20 +1110,20 @@ class ChannelFlowOk(AMQPMethodPayload):
     Confirms to the peer that a flow command was received and
     processed.
     """
-    __slots__ = (u'active', )
+    __slots__ = (u'active',)
 
     NAME = u'channel.flow-ok'
 
-    INDEX = (20, 21)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x14\x00\x15'      # CLASS ID + METHOD ID
+    INDEX = (20, 21)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x14\x00\x15'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'active', u'bit', u'bit', reserved=False),
     ]
 
@@ -1125,7 +1142,7 @@ class ChannelFlowOk(AMQPMethodPayload):
 
     def write_arguments(self, buf):
         buf.write(struct.pack('!B', (self.active << 0)))
-        
+
     def get_size(self):
         return 1
 
@@ -1149,17 +1166,17 @@ class ChannelOpen(AMQPMethodPayload):
 
     NAME = u'channel.open'
 
-    INDEX = (20, 10)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x14\x00\x0A'      # CLASS ID + METHOD ID
+    INDEX = (20, 10)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x14\x00\x0A'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x05\x00\x14\x00\x0A\x00\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'shortstr', u'shortstr', reserved=True),
     ]
 
@@ -1168,13 +1185,12 @@ class ChannelOpen(AMQPMethodPayload):
         Create frame channel.open
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        offset += s_len # reserved field!
+        offset += s_len  # reserved field!
         return ChannelOpen()
 
 
@@ -1189,17 +1205,17 @@ class ChannelOpenOk(AMQPMethodPayload):
 
     NAME = u'channel.open-ok'
 
-    INDEX = (20, 11)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x14\x00\x0B'      # CLASS ID + METHOD ID
+    INDEX = (20, 11)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x14\x00\x0B'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x05\x00\x14\x00\x0B\x00\x00\x00\x00\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'longstr', u'longstr', reserved=True),
     ]
 
@@ -1208,13 +1224,12 @@ class ChannelOpenOk(AMQPMethodPayload):
         Create frame channel.open-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!L', buf, offset)
         offset += 4
-        offset += s_len # reserved field!
+        offset += s_len  # reserved field!
         return ChannelOpenOk()
 
 
@@ -1235,20 +1250,21 @@ class ExchangeBind(AMQPMethodPayload):
     
     This method binds an exchange to an exchange.
     """
-    __slots__ = (u'destination', u'source', u'routing_key', u'no_wait', u'arguments', )
+    __slots__ = (
+    u'destination', u'source', u'routing_key', u'no_wait', u'arguments',)
 
     NAME = u'exchange.bind'
 
-    INDEX = (40, 30)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x28\x00\x1E'      # CLASS ID + METHOD ID
+    INDEX = (40, 30)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x28\x00\x1E'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'destination', u'exchange-name', u'shortstr', reserved=False),
         Field(u'source', u'exchange-name', u'shortstr', reserved=False),
@@ -1295,24 +1311,25 @@ class ExchangeBind(AMQPMethodPayload):
         buf.write(self.routing_key)
         buf.write(struct.pack('!B', (self.no_wait << 0)))
         enframe_table(buf, self.arguments)
-        
+
     def get_size(self):
-        return 6 + len(self.destination) + len(self.source) + len(self.routing_key) + frame_table_size(self.arguments)
+        return 6 + len(self.destination) + len(self.source) + len(
+            self.routing_key) + frame_table_size(self.arguments)
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        destination = buf[offset:offset+s_len]
+        destination = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        source = buf[offset:offset+s_len]
+        source = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        routing_key = buf[offset:offset+s_len]
+        routing_key = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -1320,7 +1337,8 @@ class ExchangeBind(AMQPMethodPayload):
         offset += 1
         arguments, delta = deframe_table(buf, offset)
         offset += delta
-        return ExchangeBind(destination, source, routing_key, no_wait, arguments)
+        return ExchangeBind(destination, source, routing_key, no_wait,
+                            arguments)
 
 
 class ExchangeBindOk(AMQPMethodPayload):
@@ -1333,12 +1351,12 @@ class ExchangeBindOk(AMQPMethodPayload):
 
     NAME = u'exchange.bind-ok'
 
-    INDEX = (40, 31)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x28\x00\x1F'      # CLASS ID + METHOD ID
+    INDEX = (40, 31)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x28\x00\x1F'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x28\x00\x1F\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -1347,7 +1365,6 @@ class ExchangeBindOk(AMQPMethodPayload):
         Create frame exchange.bind-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -1362,20 +1379,22 @@ class ExchangeDeclare(AMQPMethodPayload):
     and if the exchange
     exists, verifies that it is of the correct and expected class.
     """
-    __slots__ = (u'exchange', u'type_', u'passive', u'durable', u'auto_delete', u'internal', u'no_wait', u'arguments', )
+    __slots__ = (
+    u'exchange', u'type_', u'passive', u'durable', u'auto_delete', u'internal',
+    u'no_wait', u'arguments',)
 
     NAME = u'exchange.declare'
 
-    INDEX = (40, 10)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x28\x00\x0A'      # CLASS ID + METHOD ID
+    INDEX = (40, 10)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x28\x00\x0A'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'exchange', u'exchange-name', u'shortstr', reserved=False),
         Field(u'type', u'shortstr', u'shortstr', reserved=False),
@@ -1387,7 +1406,8 @@ class ExchangeDeclare(AMQPMethodPayload):
         Field(u'arguments', u'table', u'table', reserved=False),
     ]
 
-    def __init__(self, exchange, type_, passive, durable, auto_delete, internal, no_wait, arguments):
+    def __init__(self, exchange, type_, passive, durable, auto_delete,
+                 internal, no_wait, arguments):
         """
         Create frame exchange.declare
 
@@ -1459,22 +1479,26 @@ class ExchangeDeclare(AMQPMethodPayload):
         buf.write(self.exchange)
         buf.write(struct.pack('!B', len(self.type_)))
         buf.write(self.type_)
-        buf.write(struct.pack('!B', (self.passive << 0) | (self.durable << 1) | (self.auto_delete << 2) | (self.internal << 3) | (self.no_wait << 4)))
+        buf.write(struct.pack('!B',
+                              (self.passive << 0) | (self.durable << 1) | (
+                              self.auto_delete << 2) | (self.internal << 3) | (
+                              self.no_wait << 4)))
         enframe_table(buf, self.arguments)
-        
+
     def get_size(self):
-        return 5 + len(self.exchange) + len(self.type_) + frame_table_size(self.arguments)
+        return 5 + len(self.exchange) + len(self.type_) + frame_table_size(
+            self.arguments)
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        exchange = buf[offset:offset+s_len]
+        exchange = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        type_ = buf[offset:offset+s_len]
+        type_ = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -1486,7 +1510,8 @@ class ExchangeDeclare(AMQPMethodPayload):
         offset += 1
         arguments, delta = deframe_table(buf, offset)
         offset += delta
-        return ExchangeDeclare(exchange, type_, passive, durable, auto_delete, internal, no_wait, arguments)
+        return ExchangeDeclare(exchange, type_, passive, durable, auto_delete,
+                               internal, no_wait, arguments)
 
 
 class ExchangeDelete(AMQPMethodPayload):
@@ -1497,20 +1522,20 @@ class ExchangeDelete(AMQPMethodPayload):
     queue bindings on
     the exchange are cancelled.
     """
-    __slots__ = (u'exchange', u'if_unused', u'no_wait', )
+    __slots__ = (u'exchange', u'if_unused', u'no_wait',)
 
     NAME = u'exchange.delete'
 
-    INDEX = (40, 20)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x28\x00\x14'      # CLASS ID + METHOD ID
+    INDEX = (40, 20)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x28\x00\x14'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'exchange', u'exchange-name', u'shortstr', reserved=False),
         Field(u'if-unused', u'bit', u'bit', reserved=False),
@@ -1541,8 +1566,9 @@ class ExchangeDelete(AMQPMethodPayload):
         buf.write(b'\x00\x00')
         buf.write(struct.pack('!B', len(self.exchange)))
         buf.write(self.exchange)
-        buf.write(struct.pack('!B', (self.if_unused << 0) | (self.no_wait << 1)))
-        
+        buf.write(
+            struct.pack('!B', (self.if_unused << 0) | (self.no_wait << 1)))
+
     def get_size(self):
         return 4 + len(self.exchange)
 
@@ -1551,7 +1577,7 @@ class ExchangeDelete(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        exchange = buf[offset:offset+s_len]
+        exchange = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -1573,12 +1599,12 @@ class ExchangeDeclareOk(AMQPMethodPayload):
 
     NAME = u'exchange.declare-ok'
 
-    INDEX = (40, 11)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x28\x00\x0B'      # CLASS ID + METHOD ID
+    INDEX = (40, 11)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x28\x00\x0B'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x28\x00\x0B\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -1587,7 +1613,6 @@ class ExchangeDeclareOk(AMQPMethodPayload):
         Create frame exchange.declare-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -1604,12 +1629,12 @@ class ExchangeDeleteOk(AMQPMethodPayload):
 
     NAME = u'exchange.delete-ok'
 
-    INDEX = (40, 21)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x28\x00\x15'      # CLASS ID + METHOD ID
+    INDEX = (40, 21)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x28\x00\x15'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x28\x00\x15\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -1618,7 +1643,6 @@ class ExchangeDeleteOk(AMQPMethodPayload):
         Create frame exchange.delete-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -1631,20 +1655,21 @@ class ExchangeUnbind(AMQPMethodPayload):
     
     This method unbinds an exchange from an exchange.
     """
-    __slots__ = (u'destination', u'source', u'routing_key', u'no_wait', u'arguments', )
+    __slots__ = (
+    u'destination', u'source', u'routing_key', u'no_wait', u'arguments',)
 
     NAME = u'exchange.unbind'
 
-    INDEX = (40, 40)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x28\x00\x28'      # CLASS ID + METHOD ID
+    INDEX = (40, 40)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x28\x00\x28'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'destination', u'exchange-name', u'shortstr', reserved=False),
         Field(u'source', u'exchange-name', u'shortstr', reserved=False),
@@ -1685,24 +1710,25 @@ class ExchangeUnbind(AMQPMethodPayload):
         buf.write(self.routing_key)
         buf.write(struct.pack('!B', (self.no_wait << 0)))
         enframe_table(buf, self.arguments)
-        
+
     def get_size(self):
-        return 6 + len(self.destination) + len(self.source) + len(self.routing_key) + frame_table_size(self.arguments)
+        return 6 + len(self.destination) + len(self.source) + len(
+            self.routing_key) + frame_table_size(self.arguments)
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        destination = buf[offset:offset+s_len]
+        destination = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        source = buf[offset:offset+s_len]
+        source = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        routing_key = buf[offset:offset+s_len]
+        routing_key = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -1710,7 +1736,8 @@ class ExchangeUnbind(AMQPMethodPayload):
         offset += 1
         arguments, delta = deframe_table(buf, offset)
         offset += delta
-        return ExchangeUnbind(destination, source, routing_key, no_wait, arguments)
+        return ExchangeUnbind(destination, source, routing_key, no_wait,
+                              arguments)
 
 
 class ExchangeUnbindOk(AMQPMethodPayload):
@@ -1723,12 +1750,12 @@ class ExchangeUnbindOk(AMQPMethodPayload):
 
     NAME = u'exchange.unbind-ok'
 
-    INDEX = (40, 51)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x28\x00\x33'      # CLASS ID + METHOD ID
+    INDEX = (40, 51)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x28\x00\x33'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x28\x00\x33\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -1737,7 +1764,6 @@ class ExchangeUnbindOk(AMQPMethodPayload):
         Create frame exchange.unbind-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -1769,20 +1795,21 @@ class QueueBind(AMQPMethodPayload):
     to a topic
     exchange.
     """
-    __slots__ = (u'queue', u'exchange', u'routing_key', u'no_wait', u'arguments', )
+    __slots__ = (
+    u'queue', u'exchange', u'routing_key', u'no_wait', u'arguments',)
 
     NAME = u'queue.bind'
 
-    INDEX = (50, 20)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x14'      # CLASS ID + METHOD ID
+    INDEX = (50, 20)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x14'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'queue', u'queue-name', u'shortstr', reserved=False),
         Field(u'exchange', u'exchange-name', u'shortstr', reserved=False),
@@ -1841,24 +1868,25 @@ class QueueBind(AMQPMethodPayload):
         buf.write(self.routing_key)
         buf.write(struct.pack('!B', (self.no_wait << 0)))
         enframe_table(buf, self.arguments)
-        
+
     def get_size(self):
-        return 6 + len(self.queue) + len(self.exchange) + len(self.routing_key) + frame_table_size(self.arguments)
+        return 6 + len(self.queue) + len(self.exchange) + len(
+            self.routing_key) + frame_table_size(self.arguments)
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        queue = buf[offset:offset+s_len]
+        queue = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        exchange = buf[offset:offset+s_len]
+        exchange = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        routing_key = buf[offset:offset+s_len]
+        routing_key = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -1879,12 +1907,12 @@ class QueueBindOk(AMQPMethodPayload):
 
     NAME = u'queue.bind-ok'
 
-    INDEX = (50, 21)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x15'      # CLASS ID + METHOD ID
+    INDEX = (50, 21)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x15'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x32\x00\x15\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -1893,7 +1921,6 @@ class QueueBindOk(AMQPMethodPayload):
         Create frame queue.bind-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -1910,20 +1937,22 @@ class QueueDeclare(AMQPMethodPayload):
     queue and its
     contents, and the level of sharing for the queue.
     """
-    __slots__ = (u'queue', u'passive', u'durable', u'exclusive', u'auto_delete', u'no_wait', u'arguments', )
+    __slots__ = (
+    u'queue', u'passive', u'durable', u'exclusive', u'auto_delete', u'no_wait',
+    u'arguments',)
 
     NAME = u'queue.declare'
 
-    INDEX = (50, 10)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x0A'      # CLASS ID + METHOD ID
+    INDEX = (50, 10)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x0A'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'queue', u'queue-name', u'shortstr', reserved=False),
         Field(u'passive', u'bit', u'bit', reserved=False),
@@ -1934,7 +1963,8 @@ class QueueDeclare(AMQPMethodPayload):
         Field(u'arguments', u'table', u'table', reserved=False),
     ]
 
-    def __init__(self, queue, passive, durable, exclusive, auto_delete, no_wait, arguments):
+    def __init__(self, queue, passive, durable, exclusive, auto_delete,
+                 no_wait, arguments):
         """
         Create frame queue.declare
 
@@ -2004,9 +2034,12 @@ class QueueDeclare(AMQPMethodPayload):
         buf.write(b'\x00\x00')
         buf.write(struct.pack('!B', len(self.queue)))
         buf.write(self.queue)
-        buf.write(struct.pack('!B', (self.passive << 0) | (self.durable << 1) | (self.exclusive << 2) | (self.auto_delete << 3) | (self.no_wait << 4)))
+        buf.write(struct.pack('!B',
+                              (self.passive << 0) | (self.durable << 1) | (
+                              self.exclusive << 2) | (
+                              self.auto_delete << 3) | (self.no_wait << 4)))
         enframe_table(buf, self.arguments)
-        
+
     def get_size(self):
         return 4 + len(self.queue) + frame_table_size(self.arguments)
 
@@ -2015,7 +2048,7 @@ class QueueDeclare(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        queue = buf[offset:offset+s_len]
+        queue = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -2027,7 +2060,8 @@ class QueueDeclare(AMQPMethodPayload):
         offset += 1
         arguments, delta = deframe_table(buf, offset)
         offset += delta
-        return QueueDeclare(queue, passive, durable, exclusive, auto_delete, no_wait, arguments)
+        return QueueDeclare(queue, passive, durable, exclusive, auto_delete,
+                            no_wait, arguments)
 
 
 class QueueDelete(AMQPMethodPayload):
@@ -2040,20 +2074,20 @@ class QueueDelete(AMQPMethodPayload):
     configuration, and all
     consumers on the queue are cancelled.
     """
-    __slots__ = (u'queue', u'if_unused', u'if_empty', u'no_wait', )
+    __slots__ = (u'queue', u'if_unused', u'if_empty', u'no_wait',)
 
     NAME = u'queue.delete'
 
-    INDEX = (50, 40)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x28'      # CLASS ID + METHOD ID
+    INDEX = (50, 40)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x28'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'queue', u'queue-name', u'shortstr', reserved=False),
         Field(u'if-unused', u'bit', u'bit', reserved=False),
@@ -2089,8 +2123,10 @@ class QueueDelete(AMQPMethodPayload):
         buf.write(b'\x00\x00')
         buf.write(struct.pack('!B', len(self.queue)))
         buf.write(self.queue)
-        buf.write(struct.pack('!B', (self.if_unused << 0) | (self.if_empty << 1) | (self.no_wait << 2)))
-        
+        buf.write(struct.pack('!B',
+                              (self.if_unused << 0) | (self.if_empty << 1) | (
+                              self.no_wait << 2)))
+
     def get_size(self):
         return 4 + len(self.queue)
 
@@ -2099,7 +2135,7 @@ class QueueDelete(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        queue = buf[offset:offset+s_len]
+        queue = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -2118,20 +2154,20 @@ class QueueDeclareOk(AMQPMethodPayload):
     the queue, essential
     for automatically-named queues.
     """
-    __slots__ = (u'queue', u'message_count', u'consumer_count', )
+    __slots__ = (u'queue', u'message_count', u'consumer_count',)
 
     NAME = u'queue.declare-ok'
 
-    INDEX = (50, 11)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x0B'      # CLASS ID + METHOD ID
+    INDEX = (50, 11)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x0B'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'queue', u'queue-name', u'shortstr', reserved=False),
         Field(u'message-count', u'message-count', u'long', reserved=False),
         Field(u'consumer-count', u'long', u'long', reserved=False),
@@ -2161,7 +2197,7 @@ class QueueDeclareOk(AMQPMethodPayload):
         buf.write(struct.pack('!B', len(self.queue)))
         buf.write(self.queue)
         buf.write(struct.pack('!II', self.message_count, self.consumer_count))
-        
+
     def get_size(self):
         return 9 + len(self.queue)
 
@@ -2170,7 +2206,7 @@ class QueueDeclareOk(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        queue = buf[offset:offset+s_len]
+        queue = buf[offset:offset + s_len]
         offset += s_len
         message_count, consumer_count, = struct.unpack_from('!II', buf, offset)
         offset += 8
@@ -2183,20 +2219,20 @@ class QueueDeleteOk(AMQPMethodPayload):
     
     This method confirms the deletion of a queue.
     """
-    __slots__ = (u'message_count', )
+    __slots__ = (u'message_count',)
 
     NAME = u'queue.delete-ok'
 
-    INDEX = (50, 41)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x29'      # CLASS ID + METHOD ID
+    INDEX = (50, 41)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x29'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'message-count', u'message-count', u'long', reserved=False),
     ]
 
@@ -2211,7 +2247,7 @@ class QueueDeleteOk(AMQPMethodPayload):
 
     def write_arguments(self, buf):
         buf.write(struct.pack('!I', self.message_count))
-        
+
     def get_size(self):
         return 4
 
@@ -2231,20 +2267,20 @@ class QueuePurge(AMQPMethodPayload):
     awaiting
     acknowledgment.
     """
-    __slots__ = (u'queue', u'no_wait', )
+    __slots__ = (u'queue', u'no_wait',)
 
     NAME = u'queue.purge'
 
-    INDEX = (50, 30)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x1E'      # CLASS ID + METHOD ID
+    INDEX = (50, 30)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x1E'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'queue', u'queue-name', u'shortstr', reserved=False),
         Field(u'no-wait', u'no-wait', u'bit', reserved=False),
@@ -2266,7 +2302,7 @@ class QueuePurge(AMQPMethodPayload):
         buf.write(struct.pack('!B', len(self.queue)))
         buf.write(self.queue)
         buf.write(struct.pack('!B', (self.no_wait << 0)))
-        
+
     def get_size(self):
         return 4 + len(self.queue)
 
@@ -2275,7 +2311,7 @@ class QueuePurge(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        queue = buf[offset:offset+s_len]
+        queue = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -2290,20 +2326,20 @@ class QueuePurgeOk(AMQPMethodPayload):
     
     This method confirms the purge of a queue.
     """
-    __slots__ = (u'message_count', )
+    __slots__ = (u'message_count',)
 
     NAME = u'queue.purge-ok'
 
-    INDEX = (50, 31)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x1F'      # CLASS ID + METHOD ID
+    INDEX = (50, 31)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x1F'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'message-count', u'message-count', u'long', reserved=False),
     ]
 
@@ -2318,7 +2354,7 @@ class QueuePurgeOk(AMQPMethodPayload):
 
     def write_arguments(self, buf):
         buf.write(struct.pack('!I', self.message_count))
-        
+
     def get_size(self):
         return 4
 
@@ -2336,20 +2372,20 @@ class QueueUnbind(AMQPMethodPayload):
     
     This method unbinds a queue from an exchange.
     """
-    __slots__ = (u'queue', u'exchange', u'routing_key', u'arguments', )
+    __slots__ = (u'queue', u'exchange', u'routing_key', u'arguments',)
 
     NAME = u'queue.unbind'
 
-    INDEX = (50, 50)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x32'      # CLASS ID + METHOD ID
+    INDEX = (50, 50)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x32'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'queue', u'queue-name', u'shortstr', reserved=False),
         Field(u'exchange', u'exchange-name', u'shortstr', reserved=False),
@@ -2386,24 +2422,25 @@ class QueueUnbind(AMQPMethodPayload):
         buf.write(struct.pack('!B', len(self.routing_key)))
         buf.write(self.routing_key)
         enframe_table(buf, self.arguments)
-        
+
     def get_size(self):
-        return 5 + len(self.queue) + len(self.exchange) + len(self.routing_key) + frame_table_size(self.arguments)
+        return 5 + len(self.queue) + len(self.exchange) + len(
+            self.routing_key) + frame_table_size(self.arguments)
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        queue = buf[offset:offset+s_len]
+        queue = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        exchange = buf[offset:offset+s_len]
+        exchange = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        routing_key = buf[offset:offset+s_len]
+        routing_key = buf[offset:offset + s_len]
         offset += s_len
         arguments, delta = deframe_table(buf, offset)
         offset += delta
@@ -2420,12 +2457,12 @@ class QueueUnbindOk(AMQPMethodPayload):
 
     NAME = u'queue.unbind-ok'
 
-    INDEX = (50, 51)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x32\x00\x33'      # CLASS ID + METHOD ID
+    INDEX = (50, 51)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x32\x00\x33'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x32\x00\x33\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -2434,7 +2471,6 @@ class QueueUnbindOk(AMQPMethodPayload):
         Create frame queue.unbind-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -2510,48 +2546,72 @@ class BasicContentPropertyList(AMQPContentPropertyList):
         :type reserved: binary type (max length 255) (AMQP as shortstr)
         """
         zpf = bytearray([
-            (('content_type' in kwargs) << 7) | (('content_encoding' in kwargs) << 6) | (('headers' in kwargs) << 5) | (('delivery_mode' in kwargs) << 4) | (('priority' in kwargs) << 3) | (('correlation_id' in kwargs) << 2) | (('reply_to' in kwargs) << 1) | int('expiration' in kwargs),
-            (('message_id' in kwargs) << 7) | (('timestamp' in kwargs) << 6) | (('type_' in kwargs) << 5) | (('user_id' in kwargs) << 4) | (('app_id' in kwargs) << 3) | (('reserved' in kwargs) << 2)
+            (('content_type' in kwargs) << 7) | (
+            ('content_encoding' in kwargs) << 6) | (
+            ('headers' in kwargs) << 5) | (
+            ('delivery_mode' in kwargs) << 4) | (
+            ('priority' in kwargs) << 3) | (
+            ('correlation_id' in kwargs) << 2) | (
+            ('reply_to' in kwargs) << 1) | int('expiration' in kwargs),
+            (('message_id' in kwargs) << 7) | (
+            ('timestamp' in kwargs) << 6) | (('type_' in kwargs) << 5) | (
+            ('user_id' in kwargs) << 4) | (('app_id' in kwargs) << 3) | (
+            ('reserved' in kwargs) << 2)
         ])
         zpf = six.binary_type(zpf)
 
-#        If you know in advance what properties you will be using, use typized constructors like
-#
-#          runs once
-#            my_type = BasicContentPropertyList.typize('content_type', 'content_encoding')
-#
-#           runs many times
-#            props = my_type('text/plain', 'utf8')
-#
-#       instead of
-#
-#           # runs many times
-#           props = BasicContentPropertyList(content_type='text/plain', content_encoding='utf8')
-#
-#       This way you will be faster.
-#
-#       If you do not know in advance what properties you will be using, it is correct to use
-#       this constructor.
+        #        If you know in advance what properties you will be using, use typized constructors like
+        #
+        #          runs once
+        #            my_type = BasicContentPropertyList.typize('content_type', 'content_encoding')
+        #
+        #           runs many times
+        #            props = my_type('text/plain', 'utf8')
+        #
+        #       instead of
+        #
+        #           # runs many times
+        #           props = BasicContentPropertyList(content_type='text/plain', content_encoding='utf8')
+        #
+        #       This way you will be faster.
+        #
+        #       If you do not know in advance what properties you will be using, it is correct to use
+        #       this constructor.
         if zpf in BasicContentPropertyList.PARTICULAR_CLASSES:
             return BasicContentPropertyList.PARTICULAR_CLASSES[zpf](**kwargs)
         else:
-            logger.debug('Property field (BasicContentPropertyList:%s) not seen yet, compiling', repr(zpf))
-            c = compile_particular_content_property_list_class(zpf, BasicContentPropertyList.FIELDS)
+            logger.debug(
+                'Property field (BasicContentPropertyList:%s) not seen yet, compiling',
+                repr(zpf))
+            c = compile_particular_content_property_list_class(zpf,
+                                                               BasicContentPropertyList.FIELDS)
             BasicContentPropertyList.PARTICULAR_CLASSES[zpf] = c
             return c(**kwargs)
 
     @staticmethod
     def typize(*fields):
         zpf = bytearray([
-        (('content_type' in fields) << 7) | (('content_encoding' in fields) << 6) | (('headers' in fields) << 5) | (('delivery_mode' in fields) << 4) | (('priority' in fields) << 3) | (('correlation_id' in fields) << 2) | (('reply_to' in fields) << 1) | int('expiration' in kwargs),
-        (('message_id' in fields) << 7) | (('timestamp' in fields) << 6) | (('type_' in fields) << 5) | (('user_id' in fields) << 4) | (('app_id' in fields) << 3) | (('reserved' in fields) << 2)
+            (('content_type' in fields) << 7) | (
+            ('content_encoding' in fields) << 6) | (
+            ('headers' in fields) << 5) | (
+            ('delivery_mode' in fields) << 4) | (
+            ('priority' in fields) << 3) | (
+            ('correlation_id' in fields) << 2) | (
+            ('reply_to' in fields) << 1) | int('expiration' in kwargs),
+            (('message_id' in fields) << 7) | (
+            ('timestamp' in fields) << 6) | (('type_' in fields) << 5) | (
+            ('user_id' in fields) << 4) | (('app_id' in fields) << 3) | (
+            ('reserved' in fields) << 2)
         ])
         zpf = six.binary_type(zpf)
         if zpf in BasicContentPropertyList.PARTICULAR_CLASSES:
             return BasicContentPropertyList.PARTICULAR_CLASSES[zpf]
         else:
-            logger.debug('Property field (BasicContentPropertyList:%s) not seen yet, compiling', repr(zpf))
-            c = compile_particular_content_property_list_class(zpf, BasicContentPropertyList.FIELDS)
+            logger.debug(
+                'Property field (BasicContentPropertyList:%s) not seen yet, compiling',
+                repr(zpf))
+            c = compile_particular_content_property_list_class(zpf,
+                                                               BasicContentPropertyList.FIELDS)
             BasicContentPropertyList.PARTICULAR_CLASSES[zpf] = c
             return c
 
@@ -2569,12 +2629,17 @@ class BasicContentPropertyList(AMQPContentPropertyList):
         else:
             while buf[offset + pfl - 1] & 1:
                 pfl += 2
-        zpf = BasicContentPropertyList.zero_property_flags(buf[offset:offset+pfl]).tobytes()
+        zpf = BasicContentPropertyList.zero_property_flags(
+            buf[offset:offset + pfl]).tobytes()
         if zpf in BasicContentPropertyList.PARTICULAR_CLASSES:
-            return BasicContentPropertyList.PARTICULAR_CLASSES[zpf].from_buffer(buf, offset)
+            return BasicContentPropertyList.PARTICULAR_CLASSES[
+                zpf].from_buffer(buf, offset)
         else:
-            logger.debug('Property field (BasicContentPropertyList:%s) not seen yet, compiling', repr(zpf))
-            c = compile_particular_content_property_list_class(zpf, BasicContentPropertyList.FIELDS)
+            logger.debug(
+                'Property field (BasicContentPropertyList:%s) not seen yet, compiling',
+                repr(zpf))
+            c = compile_particular_content_property_list_class(zpf,
+                                                               BasicContentPropertyList.FIELDS)
             BasicContentPropertyList.PARTICULAR_CLASSES[zpf] = c
             return c.from_buffer(buf, offset)
 
@@ -2591,20 +2656,20 @@ class BasicAck(AMQPMethodPayload):
     The acknowledgement can be for a single message or a set of
     messages up to and including a specific message.
     """
-    __slots__ = (u'delivery_tag', u'multiple', )
+    __slots__ = (u'delivery_tag', u'multiple',)
 
     NAME = u'basic.ack'
 
-    INDEX = (60, 80)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x50'      # CLASS ID + METHOD ID
+    INDEX = (60, 80)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x50'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'delivery-tag', u'delivery-tag', u'longlong', reserved=False),
         Field(u'multiple', u'bit', u'bit', reserved=False),
     ]
@@ -2628,7 +2693,7 @@ class BasicAck(AMQPMethodPayload):
 
     def write_arguments(self, buf):
         buf.write(struct.pack('!QB', self.delivery_tag, (self.multiple << 0)))
-        
+
     def get_size(self):
         return 9
 
@@ -2652,20 +2717,22 @@ class BasicConsume(AMQPMethodPayload):
     channel they were
     declared on, or until the client cancels them.
     """
-    __slots__ = (u'queue', u'consumer_tag', u'no_local', u'no_ack', u'exclusive', u'no_wait', u'arguments', )
+    __slots__ = (
+    u'queue', u'consumer_tag', u'no_local', u'no_ack', u'exclusive',
+    u'no_wait', u'arguments',)
 
     NAME = u'basic.consume'
 
-    INDEX = (60, 20)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x14'      # CLASS ID + METHOD ID
+    INDEX = (60, 20)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x14'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'queue', u'queue-name', u'shortstr', reserved=False),
         Field(u'consumer-tag', u'consumer-tag', u'shortstr', reserved=False),
@@ -2676,7 +2743,8 @@ class BasicConsume(AMQPMethodPayload):
         Field(u'arguments', u'table', u'table', reserved=False),
     ]
 
-    def __init__(self, queue, consumer_tag, no_local, no_ack, exclusive, no_wait, arguments):
+    def __init__(self, queue, consumer_tag, no_local, no_ack, exclusive,
+                 no_wait, arguments):
         """
         Create frame basic.consume
 
@@ -2716,22 +2784,25 @@ class BasicConsume(AMQPMethodPayload):
         buf.write(self.queue)
         buf.write(struct.pack('!B', len(self.consumer_tag)))
         buf.write(self.consumer_tag)
-        buf.write(struct.pack('!B', (self.no_local << 0) | (self.no_ack << 1) | (self.exclusive << 2) | (self.no_wait << 3)))
+        buf.write(struct.pack('!B',
+                              (self.no_local << 0) | (self.no_ack << 1) | (
+                              self.exclusive << 2) | (self.no_wait << 3)))
         enframe_table(buf, self.arguments)
-        
+
     def get_size(self):
-        return 5 + len(self.queue) + len(self.consumer_tag) + frame_table_size(self.arguments)
+        return 5 + len(self.queue) + len(self.consumer_tag) + frame_table_size(
+            self.arguments)
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        queue = buf[offset:offset+s_len]
+        queue = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        consumer_tag = buf[offset:offset+s_len]
+        consumer_tag = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -2742,7 +2813,8 @@ class BasicConsume(AMQPMethodPayload):
         offset += 1
         arguments, delta = deframe_table(buf, offset)
         offset += delta
-        return BasicConsume(queue, consumer_tag, no_local, no_ack, exclusive, no_wait, arguments)
+        return BasicConsume(queue, consumer_tag, no_local, no_ack, exclusive,
+                            no_wait, arguments)
 
 
 class BasicCancel(AMQPMethodPayload):
@@ -2768,20 +2840,20 @@ class BasicCancel(AMQPMethodPayload):
     capable of accepting the method, through some means of
     capability negotiation.
     """
-    __slots__ = (u'consumer_tag', u'no_wait', )
+    __slots__ = (u'consumer_tag', u'no_wait',)
 
     NAME = u'basic.cancel'
 
-    INDEX = (60, 30)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x1E'      # CLASS ID + METHOD ID
+    INDEX = (60, 30)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x1E'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'consumer-tag', u'consumer-tag', u'shortstr', reserved=False),
         Field(u'no-wait', u'no-wait', u'bit', reserved=False),
     ]
@@ -2800,7 +2872,7 @@ class BasicCancel(AMQPMethodPayload):
         buf.write(struct.pack('!B', len(self.consumer_tag)))
         buf.write(self.consumer_tag)
         buf.write(struct.pack('!B', (self.no_wait << 0)))
-        
+
     def get_size(self):
         return 2 + len(self.consumer_tag)
 
@@ -2809,7 +2881,7 @@ class BasicCancel(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        consumer_tag = buf[offset:offset+s_len]
+        consumer_tag = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -2826,20 +2898,20 @@ class BasicConsumeOk(AMQPMethodPayload):
     used by the client
     for methods called on the consumer at a later stage.
     """
-    __slots__ = (u'consumer_tag', )
+    __slots__ = (u'consumer_tag',)
 
     NAME = u'basic.consume-ok'
 
-    INDEX = (60, 21)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x15'      # CLASS ID + METHOD ID
+    INDEX = (60, 21)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x15'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'consumer-tag', u'consumer-tag', u'shortstr', reserved=False),
     ]
 
@@ -2856,7 +2928,7 @@ class BasicConsumeOk(AMQPMethodPayload):
     def write_arguments(self, buf):
         buf.write(struct.pack('!B', len(self.consumer_tag)))
         buf.write(self.consumer_tag)
-        
+
     def get_size(self):
         return 1 + len(self.consumer_tag)
 
@@ -2865,7 +2937,7 @@ class BasicConsumeOk(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        consumer_tag = buf[offset:offset+s_len]
+        consumer_tag = buf[offset:offset + s_len]
         offset += s_len
         return BasicConsumeOk(consumer_tag)
 
@@ -2876,20 +2948,20 @@ class BasicCancelOk(AMQPMethodPayload):
     
     This method confirms that the cancellation was completed.
     """
-    __slots__ = (u'consumer_tag', )
+    __slots__ = (u'consumer_tag',)
 
     NAME = u'basic.cancel-ok'
 
-    INDEX = (60, 31)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x1F'      # CLASS ID + METHOD ID
+    INDEX = (60, 31)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x1F'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'consumer-tag', u'consumer-tag', u'shortstr', reserved=False),
     ]
 
@@ -2904,7 +2976,7 @@ class BasicCancelOk(AMQPMethodPayload):
     def write_arguments(self, buf):
         buf.write(struct.pack('!B', len(self.consumer_tag)))
         buf.write(self.consumer_tag)
-        
+
     def get_size(self):
         return 1 + len(self.consumer_tag)
 
@@ -2913,7 +2985,7 @@ class BasicCancelOk(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        consumer_tag = buf[offset:offset+s_len]
+        consumer_tag = buf[offset:offset + s_len]
         offset += s_len
         return BasicCancelOk(consumer_tag)
 
@@ -2930,20 +3002,21 @@ class BasicDeliver(AMQPMethodPayload):
     arrive for that
     consumer.
     """
-    __slots__ = (u'consumer_tag', u'delivery_tag', u'redelivered', u'exchange', u'routing_key', )
+    __slots__ = (u'consumer_tag', u'delivery_tag', u'redelivered', u'exchange',
+                 u'routing_key',)
 
     NAME = u'basic.deliver'
 
-    INDEX = (60, 60)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x3C'      # CLASS ID + METHOD ID
+    INDEX = (60, 60)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x3C'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'consumer-tag', u'consumer-tag', u'shortstr', reserved=False),
         Field(u'delivery-tag', u'delivery-tag', u'longlong', reserved=False),
         Field(u'redelivered', u'redelivered', u'bit', reserved=False),
@@ -2951,7 +3024,8 @@ class BasicDeliver(AMQPMethodPayload):
         Field(u'routing-key', u'shortstr', u'shortstr', reserved=False),
     ]
 
-    def __init__(self, consumer_tag, delivery_tag, redelivered, exchange, routing_key):
+    def __init__(self, consumer_tag, delivery_tag, redelivered, exchange,
+                 routing_key):
         """
         Create frame basic.deliver
 
@@ -2976,20 +3050,23 @@ class BasicDeliver(AMQPMethodPayload):
     def write_arguments(self, buf):
         buf.write(struct.pack('!B', len(self.consumer_tag)))
         buf.write(self.consumer_tag)
-        buf.write(struct.pack('!QBB', self.delivery_tag, (self.redelivered << 0), len(self.exchange)))
+        buf.write(
+            struct.pack('!QBB', self.delivery_tag, (self.redelivered << 0),
+                        len(self.exchange)))
         buf.write(self.exchange)
         buf.write(struct.pack('!B', len(self.routing_key)))
         buf.write(self.routing_key)
-        
+
     def get_size(self):
-        return 12 + len(self.consumer_tag) + len(self.exchange) + len(self.routing_key)
+        return 12 + len(self.consumer_tag) + len(self.exchange) + len(
+            self.routing_key)
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        consumer_tag = buf[offset:offset+s_len]
+        consumer_tag = buf[offset:offset + s_len]
         offset += s_len
         delivery_tag, _bit, = struct.unpack_from('!QB', buf, offset)
         offset += 8
@@ -2997,13 +3074,14 @@ class BasicDeliver(AMQPMethodPayload):
         offset += 1
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        exchange = buf[offset:offset+s_len]
+        exchange = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        routing_key = buf[offset:offset+s_len]
+        routing_key = buf[offset:offset + s_len]
         offset += s_len
-        return BasicDeliver(consumer_tag, delivery_tag, redelivered, exchange, routing_key)
+        return BasicDeliver(consumer_tag, delivery_tag, redelivered, exchange,
+                            routing_key)
 
 
 class BasicGet(AMQPMethodPayload):
@@ -3016,20 +3094,20 @@ class BasicGet(AMQPMethodPayload):
     where synchronous
     functionality is more important than performance.
     """
-    __slots__ = (u'queue', u'no_ack', )
+    __slots__ = (u'queue', u'no_ack',)
 
     NAME = u'basic.get'
 
-    INDEX = (60, 70)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x46'      # CLASS ID + METHOD ID
+    INDEX = (60, 70)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x46'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'queue', u'queue-name', u'shortstr', reserved=False),
         Field(u'no-ack', u'no-ack', u'bit', reserved=False),
@@ -3051,7 +3129,7 @@ class BasicGet(AMQPMethodPayload):
         buf.write(struct.pack('!B', len(self.queue)))
         buf.write(self.queue)
         buf.write(struct.pack('!B', (self.no_ack << 0)))
-        
+
     def get_size(self):
         return 4 + len(self.queue)
 
@@ -3060,7 +3138,7 @@ class BasicGet(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        queue = buf[offset:offset+s_len]
+        queue = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -3079,20 +3157,21 @@ class BasicGetOk(AMQPMethodPayload):
     option was set in the
     get method.
     """
-    __slots__ = (u'delivery_tag', u'redelivered', u'exchange', u'routing_key', u'message_count', )
+    __slots__ = (u'delivery_tag', u'redelivered', u'exchange', u'routing_key',
+                 u'message_count',)
 
     NAME = u'basic.get-ok'
 
-    INDEX = (60, 71)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x47'      # CLASS ID + METHOD ID
+    INDEX = (60, 71)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x47'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'delivery-tag', u'delivery-tag', u'longlong', reserved=False),
         Field(u'redelivered', u'redelivered', u'bit', reserved=False),
         Field(u'exchange', u'exchange-name', u'shortstr', reserved=False),
@@ -3100,7 +3179,8 @@ class BasicGetOk(AMQPMethodPayload):
         Field(u'message-count', u'message-count', u'long', reserved=False),
     ]
 
-    def __init__(self, delivery_tag, redelivered, exchange, routing_key, message_count):
+    def __init__(self, delivery_tag, redelivered, exchange, routing_key,
+                 message_count):
         """
         Create frame basic.get-ok
 
@@ -3123,12 +3203,14 @@ class BasicGetOk(AMQPMethodPayload):
         self.message_count = message_count
 
     def write_arguments(self, buf):
-        buf.write(struct.pack('!QBB', self.delivery_tag, (self.redelivered << 0), len(self.exchange)))
+        buf.write(
+            struct.pack('!QBB', self.delivery_tag, (self.redelivered << 0),
+                        len(self.exchange)))
         buf.write(self.exchange)
         buf.write(struct.pack('!B', len(self.routing_key)))
         buf.write(self.routing_key)
         buf.write(struct.pack('!I', self.message_count))
-        
+
     def get_size(self):
         return 15 + len(self.exchange) + len(self.routing_key)
 
@@ -3141,15 +3223,16 @@ class BasicGetOk(AMQPMethodPayload):
         offset += 1
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        exchange = buf[offset:offset+s_len]
+        exchange = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        routing_key = buf[offset:offset+s_len]
+        routing_key = buf[offset:offset + s_len]
         offset += s_len
         message_count, = struct.unpack_from('!I', buf, offset)
         offset += 4
-        return BasicGetOk(delivery_tag, redelivered, exchange, routing_key, message_count)
+        return BasicGetOk(delivery_tag, redelivered, exchange, routing_key,
+                          message_count)
 
 
 class BasicGetEmpty(AMQPMethodPayload):
@@ -3164,17 +3247,17 @@ class BasicGetEmpty(AMQPMethodPayload):
 
     NAME = u'basic.get-empty'
 
-    INDEX = (60, 72)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x48'      # CLASS ID + METHOD ID
+    INDEX = (60, 72)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x48'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x0D\x00\x3C\x00\x48\x00\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'shortstr', u'shortstr', reserved=True),
     ]
 
@@ -3183,13 +3266,12 @@ class BasicGetEmpty(AMQPMethodPayload):
         Create frame basic.get-empty
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        offset += s_len # reserved field!
+        offset += s_len  # reserved field!
         return BasicGetEmpty()
 
 
@@ -3208,20 +3290,20 @@ class BasicNack(AMQPMethodPayload):
     method, it
     probably needs to republish the offending messages.
     """
-    __slots__ = (u'delivery_tag', u'multiple', u'requeue', )
+    __slots__ = (u'delivery_tag', u'multiple', u'requeue',)
 
     NAME = u'basic.nack'
 
-    INDEX = (60, 120)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x78'      # CLASS ID + METHOD ID
+    INDEX = (60, 120)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x78'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'delivery-tag', u'delivery-tag', u'longlong', reserved=False),
         Field(u'multiple', u'bit', u'bit', reserved=False),
         Field(u'requeue', u'bit', u'bit', reserved=False),
@@ -3253,8 +3335,9 @@ class BasicNack(AMQPMethodPayload):
         self.requeue = requeue
 
     def write_arguments(self, buf):
-        buf.write(struct.pack('!QB', self.delivery_tag, (self.multiple << 0) | (self.requeue << 1)))
-        
+        buf.write(struct.pack('!QB', self.delivery_tag,
+                              (self.multiple << 0) | (self.requeue << 1)))
+
     def get_size(self):
         return 9
 
@@ -3279,20 +3362,20 @@ class BasicPublish(AMQPMethodPayload):
     distributed to any active
     consumers when the transaction, if any, is committed.
     """
-    __slots__ = (u'exchange', u'routing_key', u'mandatory', u'immediate', )
+    __slots__ = (u'exchange', u'routing_key', u'mandatory', u'immediate',)
 
     NAME = u'basic.publish'
 
-    INDEX = (60, 40)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x28'      # CLASS ID + METHOD ID
+    INDEX = (60, 40)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x28'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reserved-1', u'short', u'short', reserved=True),
         Field(u'exchange', u'exchange-name', u'shortstr', reserved=False),
         Field(u'routing-key', u'shortstr', u'shortstr', reserved=False),
@@ -3346,8 +3429,9 @@ class BasicPublish(AMQPMethodPayload):
         buf.write(self.exchange)
         buf.write(struct.pack('!B', len(self.routing_key)))
         buf.write(self.routing_key)
-        buf.write(struct.pack('!B', (self.mandatory << 0) | (self.immediate << 1)))
-        
+        buf.write(
+            struct.pack('!B', (self.mandatory << 0) | (self.immediate << 1)))
+
     def get_size(self):
         return 5 + len(self.exchange) + len(self.routing_key)
 
@@ -3356,11 +3440,11 @@ class BasicPublish(AMQPMethodPayload):
         offset = start_offset
         s_len, = struct.unpack_from('!2xB', buf, offset)
         offset += 3
-        exchange = buf[offset:offset+s_len]
+        exchange = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        routing_key = buf[offset:offset+s_len]
+        routing_key = buf[offset:offset + s_len]
         offset += s_len
         _bit, = struct.unpack_from('!B', buf, offset)
         offset += 0
@@ -3384,20 +3468,20 @@ class BasicQos(AMQPMethodPayload):
     currently meaningful only
     for the server.
     """
-    __slots__ = (u'prefetch_size', u'prefetch_count', u'global_', )
+    __slots__ = (u'prefetch_size', u'prefetch_count', u'global_',)
 
     NAME = u'basic.qos'
 
-    INDEX = (60, 10)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x0A'      # CLASS ID + METHOD ID
+    INDEX = (60, 10)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x0A'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'prefetch-size', u'long', u'long', reserved=False),
         Field(u'prefetch-count', u'short', u'short', reserved=False),
         Field(u'global', u'bit', u'bit', reserved=False),
@@ -3451,15 +3535,17 @@ class BasicQos(AMQPMethodPayload):
         self.global_ = global_
 
     def write_arguments(self, buf):
-        buf.write(struct.pack('!IHB', self.prefetch_size, self.prefetch_count, (self.global_ << 0)))
-        
+        buf.write(struct.pack('!IHB', self.prefetch_size, self.prefetch_count,
+                              (self.global_ << 0)))
+
     def get_size(self):
         return 7
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
-        prefetch_size, prefetch_count, _bit, = struct.unpack_from('!IHB', buf, offset)
+        prefetch_size, prefetch_count, _bit, = struct.unpack_from('!IHB', buf,
+                                                                  offset)
         offset += 6
         global_ = bool(_bit >> 0)
         offset += 1
@@ -3480,12 +3566,12 @@ class BasicQosOk(AMQPMethodPayload):
 
     NAME = u'basic.qos-ok'
 
-    INDEX = (60, 11)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x0B'      # CLASS ID + METHOD ID
+    INDEX = (60, 11)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x0B'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x3C\x00\x0B\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -3494,7 +3580,6 @@ class BasicQosOk(AMQPMethodPayload):
         Create frame basic.qos-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -3513,20 +3598,20 @@ class BasicReturn(AMQPMethodPayload):
     the message was
     undeliverable.
     """
-    __slots__ = (u'reply_code', u'reply_text', u'exchange', u'routing_key', )
+    __slots__ = (u'reply_code', u'reply_text', u'exchange', u'routing_key',)
 
     NAME = u'basic.return'
 
-    INDEX = (60, 50)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x32'      # CLASS ID + METHOD ID
+    INDEX = (60, 50)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x32'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = False     # this means that argument part has always the same length
+    IS_SIZE_STATIC = False  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'reply-code', u'reply-code', u'short', reserved=False),
         Field(u'reply-text', u'reply-text', u'shortstr', reserved=False),
         Field(u'exchange', u'exchange-name', u'shortstr', reserved=False),
@@ -3560,24 +3645,25 @@ class BasicReturn(AMQPMethodPayload):
         buf.write(self.exchange)
         buf.write(struct.pack('!B', len(self.routing_key)))
         buf.write(self.routing_key)
-        
+
     def get_size(self):
-        return 5 + len(self.reply_text) + len(self.exchange) + len(self.routing_key)
+        return 5 + len(self.reply_text) + len(self.exchange) + len(
+            self.routing_key)
 
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
         reply_code, s_len, = struct.unpack_from('!HB', buf, offset)
         offset += 3
-        reply_text = buf[offset:offset+s_len]
+        reply_text = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        exchange = buf[offset:offset+s_len]
+        exchange = buf[offset:offset + s_len]
         offset += s_len
         s_len, = struct.unpack_from('!B', buf, offset)
         offset += 1
-        routing_key = buf[offset:offset+s_len]
+        routing_key = buf[offset:offset + s_len]
         offset += s_len
         return BasicReturn(reply_code, reply_text, exchange, routing_key)
 
@@ -3592,20 +3678,20 @@ class BasicReject(AMQPMethodPayload):
     to their original
     queue.
     """
-    __slots__ = (u'delivery_tag', u'requeue', )
+    __slots__ = (u'delivery_tag', u'requeue',)
 
     NAME = u'basic.reject'
 
-    INDEX = (60, 90)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x5A'      # CLASS ID + METHOD ID
+    INDEX = (60, 90)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x5A'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'delivery-tag', u'delivery-tag', u'longlong', reserved=False),
         Field(u'requeue', u'bit', u'bit', reserved=False),
     ]
@@ -3627,7 +3713,7 @@ class BasicReject(AMQPMethodPayload):
 
     def write_arguments(self, buf):
         buf.write(struct.pack('!QB', self.delivery_tag, (self.requeue << 0)))
-        
+
     def get_size(self):
         return 9
 
@@ -3651,20 +3737,20 @@ class BasicRecoverAsync(AMQPMethodPayload):
     This method
     is deprecated in favour of the synchronous Recover/Recover-Ok.
     """
-    __slots__ = (u'requeue', )
+    __slots__ = (u'requeue',)
 
     NAME = u'basic.recover-async'
 
-    INDEX = (60, 100)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x64'      # CLASS ID + METHOD ID
+    INDEX = (60, 100)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x64'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'requeue', u'bit', u'bit', reserved=False),
     ]
 
@@ -3684,7 +3770,7 @@ class BasicRecoverAsync(AMQPMethodPayload):
 
     def write_arguments(self, buf):
         buf.write(struct.pack('!B', (self.requeue << 0)))
-        
+
     def get_size(self):
         return 1
 
@@ -3708,20 +3794,20 @@ class BasicRecover(AMQPMethodPayload):
     This method
     replaces the asynchronous Recover.
     """
-    __slots__ = (u'requeue', )
+    __slots__ = (u'requeue',)
 
     NAME = u'basic.recover'
 
-    INDEX = (60, 110)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x6E'      # CLASS ID + METHOD ID
+    INDEX = (60, 110)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x6E'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'requeue', u'bit', u'bit', reserved=False),
     ]
 
@@ -3741,7 +3827,7 @@ class BasicRecover(AMQPMethodPayload):
 
     def write_arguments(self, buf):
         buf.write(struct.pack('!B', (self.requeue << 0)))
-        
+
     def get_size(self):
         return 1
 
@@ -3765,12 +3851,12 @@ class BasicRecoverOk(AMQPMethodPayload):
 
     NAME = u'basic.recover-ok'
 
-    INDEX = (60, 111)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x3C\x00\x6F'      # CLASS ID + METHOD ID
+    INDEX = (60, 111)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x3C\x00\x6F'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x3C\x00\x6F\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -3779,7 +3865,6 @@ class BasicRecoverOk(AMQPMethodPayload):
         Create frame basic.recover-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -3823,12 +3908,12 @@ class TxCommit(AMQPMethodPayload):
 
     NAME = u'tx.commit'
 
-    INDEX = (90, 20)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x5A\x00\x14'      # CLASS ID + METHOD ID
+    INDEX = (90, 20)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x5A\x00\x14'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x5A\x00\x14\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -3837,7 +3922,6 @@ class TxCommit(AMQPMethodPayload):
         Create frame tx.commit
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -3856,12 +3940,12 @@ class TxCommitOk(AMQPMethodPayload):
 
     NAME = u'tx.commit-ok'
 
-    INDEX = (90, 21)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x5A\x00\x15'      # CLASS ID + METHOD ID
+    INDEX = (90, 21)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x5A\x00\x15'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x5A\x00\x15\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -3870,7 +3954,6 @@ class TxCommitOk(AMQPMethodPayload):
         Create frame tx.commit-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -3893,12 +3976,12 @@ class TxRollback(AMQPMethodPayload):
 
     NAME = u'tx.rollback'
 
-    INDEX = (90, 30)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x5A\x00\x1E'      # CLASS ID + METHOD ID
+    INDEX = (90, 30)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x5A\x00\x1E'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x5A\x00\x1E\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -3907,7 +3990,6 @@ class TxRollback(AMQPMethodPayload):
         Create frame tx.rollback
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -3926,12 +4008,12 @@ class TxRollbackOk(AMQPMethodPayload):
 
     NAME = u'tx.rollback-ok'
 
-    INDEX = (90, 31)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x5A\x00\x1F'      # CLASS ID + METHOD ID
+    INDEX = (90, 31)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x5A\x00\x1F'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x5A\x00\x1F\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -3940,7 +4022,6 @@ class TxRollbackOk(AMQPMethodPayload):
         Create frame tx.rollback-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -3960,12 +4041,12 @@ class TxSelect(AMQPMethodPayload):
 
     NAME = u'tx.select'
 
-    INDEX = (90, 10)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x5A\x00\x0A'      # CLASS ID + METHOD ID
+    INDEX = (90, 10)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x5A\x00\x0A'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x5A\x00\x0A\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -3974,7 +4055,6 @@ class TxSelect(AMQPMethodPayload):
         Create frame tx.select
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -3993,12 +4073,12 @@ class TxSelectOk(AMQPMethodPayload):
 
     NAME = u'tx.select-ok'
 
-    INDEX = (90, 11)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x5A\x00\x0B'      # CLASS ID + METHOD ID
+    INDEX = (90, 11)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x5A\x00\x0B'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x5A\x00\x0B\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -4007,7 +4087,6 @@ class TxSelectOk(AMQPMethodPayload):
         Create frame tx.select-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -4046,20 +4125,20 @@ class ConfirmSelect(AMQPMethodPayload):
     The client can only use this method on a non-transactional
     channel.
     """
-    __slots__ = (u'nowait', )
+    __slots__ = (u'nowait',)
 
     NAME = u'confirm.select'
 
-    INDEX = (85, 10)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x55\x00\x0A'      # CLASS ID + METHOD ID
+    INDEX = (85, 10)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x55\x00\x0A'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = True, False
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = False  # this means that argument part has always the same content
 
     # See constructor pydoc for details
-    FIELDS = [ 
+    FIELDS = [
         Field(u'nowait', u'bit', u'bit', reserved=False),
     ]
 
@@ -4078,7 +4157,7 @@ class ConfirmSelect(AMQPMethodPayload):
 
     def write_arguments(self, buf):
         buf.write(struct.pack('!B', (self.nowait << 0)))
-        
+
     def get_size(self):
         return 1
 
@@ -4103,12 +4182,12 @@ class ConfirmSelectOk(AMQPMethodPayload):
 
     NAME = u'confirm.select-ok'
 
-    INDEX = (85, 11)          # (Class ID, Method ID)
-    BINARY_HEADER = b'\x00\x55\x00\x0B'      # CLASS ID + METHOD ID
+    INDEX = (85, 11)  # (Class ID, Method ID)
+    BINARY_HEADER = b'\x00\x55\x00\x0B'  # CLASS ID + METHOD ID
 
     SENT_BY_CLIENT, SENT_BY_SERVER = False, True
 
-    IS_SIZE_STATIC = True     # this means that argument part has always the same length
+    IS_SIZE_STATIC = True  # this means that argument part has always the same length
     IS_CONTENT_STATIC = True  # this means that argument part has always the same content
     STATIC_CONTENT = b'\x00\x00\x00\x04\x00\x55\x00\x0B\xCE'  # spans LENGTH, CLASS ID, METHOD ID, ....., FRAME_END
 
@@ -4117,7 +4196,6 @@ class ConfirmSelectOk(AMQPMethodPayload):
         Create frame confirm.select-ok
         """
 
-
     @staticmethod
     def from_buffer(buf, start_offset):
         offset = start_offset
@@ -4189,7 +4267,6 @@ IDENT_TO_METHOD = {
     (50, 10): QueueDeclare,
 }
 
-
 BINARY_HEADER_TO_METHOD = {
     b'\x00\x5A\x00\x15': TxCommitOk,
     b'\x00\x3C\x00\x64': BasicRecoverAsync,
@@ -4255,7 +4332,6 @@ BINARY_HEADER_TO_METHOD = {
     b'\x00\x32\x00\x0A': QueueDeclare,
 }
 
-
 CLASS_ID_TO_CONTENT_PROPERTY_LIST = {
     60: BasicContentPropertyList,
 }
@@ -4295,7 +4371,7 @@ REPLY_REASONS_FOR = {
 # Methods that are replies for other, ie. ConnectionOpenOk: ConnectionOpen
 # a method may be a reply for ONE or NONE other methods
 # if a method has no replies, it will have an empty list as value here
-REPLIES_FOR= {
+REPLIES_FOR = {
     BasicGetEmpty: [],
     BasicRecoverOk: [],
     BasicReturn: [],
diff --git a/coolamqp/framing/field_table.py b/coolamqp/framing/field_table.py
index a8188590d4558eb4b4d5d316a2edc15a1642630b..98ffe811f180a94e777582a43dba673883b4838a 100644
--- a/coolamqp/framing/field_table.py
+++ b/coolamqp/framing/field_table.py
@@ -1,5 +1,6 @@
 # coding=UTF-8
 from __future__ import print_function, division, absolute_import
+
 """
 That funny type, field-table...
 
@@ -67,6 +68,7 @@ def enframe_longstr(buf, value):
 def _c2none(buf, v):
     return None
 
+
 FIELD_TYPES = {
     # length, struct, (option)to_bytes (callable(buffer, value)),
     #                 (option)from_bytes (callable(buffer, offset) ->
diff --git a/coolamqp/uplink/connection/recv_framer.py b/coolamqp/uplink/connection/recv_framer.py
index 946e25342eda4a2bb141e0b208b91787bab39387..afee76b57738d511a2d54e55f6a70ee76fa630f0 100644
--- a/coolamqp/uplink/connection/recv_framer.py
+++ b/coolamqp/uplink/connection/recv_framer.py
@@ -18,7 +18,6 @@ FRAME_TYPES = {
     FRAME_METHOD: AMQPMethodFrame
 }
 
-
 ordpy2 = ord if six.PY2 else lambda x: x
 
 
@@ -81,7 +80,7 @@ class ReceivingFramer(object):
         """
         assert self.total_data_len >= up_to, \
             'Tried to extract %s but %s remaining' % (
-            up_to, self.total_data_len)
+                up_to, self.total_data_len)
         if up_to >= len(self.chunks[0]):
             q = self.chunks.popleft()
         else:
@@ -93,7 +92,6 @@ class ReceivingFramer(object):
             len(q), up_to)
         return q
 
-
     def _statemachine(self):
         # state rule 1
         if self.frame_type is None and self.total_data_len > 0:
@@ -125,7 +123,7 @@ class ReceivingFramer(object):
         # state rule 3
         elif (self.frame_type != FRAME_HEARTBEAT) and (
                     self.frame_type is not None) and (
-            self.frame_size is None) and (
+                    self.frame_size is None) and (
                     self.total_data_len > 6):
             hdr = b''
             while len(hdr) < 6: