diff --git a/wsme/rest/json.py b/wsme/rest/json.py index 8f6aca8..5fb2a6f 100644 --- a/wsme/rest/json.py +++ b/wsme/rest/json.py @@ -169,9 +169,9 @@ def dict_fromjson(datatype, value): @fromjson.when_object(six.binary_type) def str_fromjson(datatype, value): - if (isinstance(value, six.string_types) - or isinstance(value, six.integer_types) - or isinstance(value, float)): + if (isinstance(value, six.string_types) or + isinstance(value, six.integer_types) or + isinstance(value, float)): return six.text_type(value).encode('utf8') diff --git a/wsme/root.py b/wsme/root.py index 03561af..fcc2442 100644 --- a/wsme/root.py +++ b/wsme/root.py @@ -145,10 +145,9 @@ class WSRoot(object): log.debug("Selecting a protocol for the following request :\n" "headers: %s\nbody: %s", request.headers.items(), request.content_length and ( - request.content_length > 512 - and request.body[:512] - or request.body) - or '') + request.content_length > 512 and + request.body[:512] or + request.body) or '') protocol = None path = str(request.path) assert path.startswith(self._webpath) diff --git a/wsme/types.py b/wsme/types.py index 296959f..d774398 100644 --- a/wsme/types.py +++ b/wsme/types.py @@ -586,8 +586,8 @@ def inspect_class(class_): attrdef = attr else: if attr not in native_types and ( - inspect.isclass(attr) - or isinstance(attr, (list, dict))): + inspect.isclass(attr) or + isinstance(attr, (list, dict))): register_type(attr) attrdef = getattr(class_, '__wsattrclass__', wsattr)(attr) diff --git a/wsmeext/sphinxext.py b/wsmeext/sphinxext.py index 0ffdeb1..fa47f9b 100644 --- a/wsmeext/sphinxext.py +++ b/wsmeext/sphinxext.py @@ -490,8 +490,8 @@ class FunctionDocumenter(autodoc.MethodDocumenter): @staticmethod def can_document_member(member, membername, isattr, parent): - return (isinstance(parent, ServiceDocumenter) - and wsme.api.iswsmefunction(member)) + return (isinstance(parent, ServiceDocumenter) and + wsme.api.iswsmefunction(member)) def import_object(self): ret = super(FunctionDocumenter, self).import_object()