Skip to content

Commit

Permalink
Fix Travis test failures.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmac committed Aug 18, 2014
1 parent 7348c27 commit 8e9beb9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ python:
- "2.6"
- "2.7"
before_script:
- flake8 --ignore=E121,E123,E124,E125,E126,E127,E128,E501 basket
- flake8 basket
script: coverage run setup.py test
install:
- pip install -r test-requirements.txt --use-mirrors
Expand Down
2 changes: 1 addition & 1 deletion basket/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def __init__(self, *args, **kwargs):
class BasketNetworkException(BasketException):
"""Used on error connecting to basket"""
def __init__(self, *args, **kwargs):
if not 'code' in kwargs:
if 'code' not in kwargs:
kwargs['code'] = errors.BASKET_NETWORK_FAILURE
super(BasketNetworkException, self).__init__(*args, **kwargs)

Expand Down
2 changes: 1 addition & 1 deletion basket/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test_response_content(self):

def test_response_no_content_type(self):
"""parse_response() doesn't fail if the response is missing a content type"""
#(probably only an issue in testing, but still...)
# probably only an issue in testing, but still...
data = {u'status': u'ok', u'foo': u'bar'}
content = json.dumps(data)
res = Mock(status_code=200, content=content)
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[flake8]
ignore=E121,E123,E124,E125,E126,E127,E128,E501
max-line-length=150

0 comments on commit 8e9beb9

Please sign in to comment.