Skip to content

Commit

Permalink
fix pep8 test
Browse files Browse the repository at this point in the history
  • Loading branch information
Gauvain Pocentek committed Aug 21, 2015
1 parent 24d5035 commit e93188e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
3 changes: 2 additions & 1 deletion gitlab/__init__.py
Expand Up @@ -627,7 +627,8 @@ class GitlabObject(object):
"""
#: Url to use in GitLab for this object
_url = None
#some objects (e.g. merge requests) have different urls for singular and plural
# Some objects (e.g. merge requests) have different urls for singular and
# plural
_urlPlural = None
_returnClass = None
_constructorTypes = None
Expand Down
21 changes: 10 additions & 11 deletions gitlab/tests/test_gitlab.py
Expand Up @@ -22,7 +22,6 @@
import unittest
except ImportError:
import unittest2 as unittest
import json

from httmock import HTTMock # noqa
from httmock import response # noqa
Expand Down Expand Up @@ -184,16 +183,16 @@ def test_list_next_link(self):
path='/api/v3/projects/1/repository/branches', method="get",
query=r'per_page=1')
def resp_one(url, request):
"""
First request:
"""First request:
http://localhost/api/v3/projects/1/repository/branches?per_page=1
"""
headers = {
'content-type': 'application/json',
'link': '<http://localhost/api/v3/projects/1/repository/branc' \
'hes?page=2&per_page=0>; rel="next", <http://localhost/api/v3' \
'/projects/1/repository/branches?page=2&per_page=0>; rel="las' \
't", <http://localhost/api/v3/projects/1/repository/branches?' \
'link': '<http://localhost/api/v3/projects/1/repository/branc'
'hes?page=2&per_page=0>; rel="next", <http://localhost/api/v3'
'/projects/1/repository/branches?page=2&per_page=0>; rel="las'
't", <http://localhost/api/v3/projects/1/repository/branches?'
'page=1&per_page=0>; rel="first"'
}
content = ('[{"branch_name": "otherbranch", '
Expand All @@ -207,10 +206,10 @@ def resp_one(url, request):
def resp_two(url, request):
headers = {
'content-type': 'application/json',
'link': '<http://localhost/api/v3/projects/1/repository/branc' \
'hes?page=1&per_page=0>; rel="prev", <http://localhost/api/v3' \
'/projects/1/repository/branches?page=2&per_page=0>; rel="las' \
't", <http://localhost/api/v3/projects/1/repository/branches?' \
'link': '<http://localhost/api/v3/projects/1/repository/branc'
'hes?page=1&per_page=0>; rel="prev", <http://localhost/api/v3'
'/projects/1/repository/branches?page=2&per_page=0>; rel="las'
't", <http://localhost/api/v3/projects/1/repository/branches?'
'page=1&per_page=0>; rel="first"'
}
content = ('[{"branch_name": "testbranch", '
Expand Down

0 comments on commit e93188e

Please sign in to comment.