Skip to content

Commit

Permalink
pep8 cleanups and release 0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cdent committed Feb 16, 2015
1 parent b694932 commit b7a9d36
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion gabbi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# under the License.
"""See gabbi.driver and gabbbi.case."""

__version__ = '0.7.1'
__version__ = '0.8.0'
14 changes: 7 additions & 7 deletions gabbi/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ def _assert_response(self, response, content, status, headers=None,

# Decode and store response before anything else
decoded_output = self._decode_content(response, content)
if (decoded_output
and 'application/json' in response.get('content-type', '')):
if (decoded_output and
'application/json' in response.get('content-type', '')):
self.json_data = json.loads(decoded_output)

# Never accept a 500
Expand Down Expand Up @@ -168,11 +168,11 @@ def _load_data_file(self, filename):
@staticmethod
def _not_binary(content_type):
"""Decide if something is content we'd like to treat as a string."""
return (content_type.startswith('text/')
or content_type.endswith('+xml')
or content_type.endswith('+json')
or content_type == 'application/javascript'
or content_type == 'application/json')
return (content_type.startswith('text/') or
content_type.endswith('+xml') or
content_type.endswith('+json') or
content_type == 'application/javascript' or
content_type == 'application/json')

def _parse_url(self, url, ssl=False):
"""Create a url from test data.
Expand Down

0 comments on commit b7a9d36

Please sign in to comment.