From 5e79db5ca40910a679536cb928aa8408a4b29d08 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 18 Apr 2014 17:22:08 -0400 Subject: [PATCH] More style tweaks for PEP8 --- confluent/common/tlv.py | 1 + confluent/config/configmanager.py | 7 +++---- confluent/httpapi.py | 14 ++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/confluent/common/tlv.py b/confluent/common/tlv.py index 6d3c7cce..99fd7869 100644 --- a/confluent/common/tlv.py +++ b/confluent/common/tlv.py @@ -15,5 +15,6 @@ # limitations under the License. # Define types for TLV use in logs and other + class Types(object): text, json = range(2) diff --git a/confluent/config/configmanager.py b/confluent/config/configmanager.py index a3f2a91f..8414e2b2 100644 --- a/confluent/config/configmanager.py +++ b/confluent/config/configmanager.py @@ -734,9 +734,9 @@ class ConfigManager(object): for attr in attribmap[group].iterkeys(): if (attr != 'nodes' and (attr not in allattributes.node or - ('type' in allattributes.node[attr] and not isinstance( - attribmap[group][attr], - allattributes.node[attr]['type'])))): + ('type' in allattributes.node[attr] and + not isinstance(attribmap[group][attr], + allattributes.node[attr]['type'])))): raise ValueError if attr == 'nodes': if not isinstance(attribmap[group][attr], list): @@ -1056,4 +1056,3 @@ try: ConfigManager._read_from_path() except IOError: _cfgstore = {} - diff --git a/confluent/httpapi.py b/confluent/httpapi.py index c0936122..b37d6b0a 100644 --- a/confluent/httpapi.py +++ b/confluent/httpapi.py @@ -52,7 +52,8 @@ def group_creation_resources(): yield confluent.messages.Attributes( kv={'name': None}, desc="Name of the group").html() + '
' yield confluent.messages.ListAttributes(kv={'nodes': []}, - desc='Nodes to add to the group').html() + '
\n' + desc='Nodes to add to the group' + ).html() + '
\n' for attr in sorted(attribs.node.iterkeys()): if attr == 'groups': continue @@ -60,8 +61,8 @@ def group_creation_resources(): yield confluent.messages.CryptedAttributes( kv={attr: None}, desc=attribs.node[attr]['description']).html() + '
\n' - elif 'type' in attribs.node[attr] and list == attribs.node[attr][ - 'type']: + elif ('type' in attribs.node[attr] and + list == attribs.node[attr]['type']): yield confluent.messages.ListAttributes( kv={attr: []}, desc=attribs.node[attr]['description']).html() + '
\n' @@ -79,8 +80,8 @@ def node_creation_resources(): yield confluent.messages.CryptedAttributes( kv={attr: None}, desc=attribs.node[attr]['description']).html() + '
\n' - elif 'type' in attribs.node[attr] and list == attribs.node[attr][ - 'type']: + elif ('type' in attribs.node[attr] and + list == attribs.node[attr]['type']): yield confluent.messages.ListAttributes( kv={attr: []}, desc=attribs.node[attr]['description']).html() + '
\n' @@ -373,7 +374,8 @@ def resourcehandler_backend(env, start_response): def _assemble_html(responses, resource, querydict, url): yield '' \ 'Confluent REST Explorer: ' + url + '' \ - '
' + '' if querydict: yield 'Response to input data:
' + \ json.dumps(querydict, separators=(',', ': '),