Skip to content

Fix error when fetching single MergeRequests #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpocentek merged 2 commits into from
Aug 21, 2015
Merged

Fix error when fetching single MergeRequests #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
227f71c
fix url when fetching a single MergeRequest
stefanklug Aug 12, 2015
79d452d
add support to update MergeRequestNotes
stefanklug Aug 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions gitlab/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@ def set_url(self, url):

def _construct_url(self, id_, obj, parameters):
args = _sanitize_dict(parameters)
url = obj._url % args
if id_ is None and obj._urlPlural is not None:
url = obj._urlPlural % args
else:
url = obj._url % args

if id_ is not None:
url = '%s%s/%s' % (self._url, url, str(id_))
else:
Expand Down Expand Up @@ -616,6 +620,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
_urlPlural = None
_returnClass = None
_constructorTypes = None
#: Whether _get_list_or_object should return list or object when id is None
Expand Down Expand Up @@ -1056,14 +1062,14 @@ class ProjectTag(GitlabObject):
class ProjectMergeRequestNote(GitlabObject):
_url = '/projects/%(project_id)s/merge_requests/%(merge_request_id)s/notes'
_constructorTypes = {'author': 'User'}
canUpdate = False
canDelete = False
requiredUrlAttrs = ['project_id', 'merge_request_id']
requiredCreateAttrs = ['body']


class ProjectMergeRequest(GitlabObject):
_url = '/projects/%(project_id)s/merge_requests'
_url = '/projects/%(project_id)s/merge_request'
_urlPlural = '/projects/%(project_id)s/merge_requests'
_constructorTypes = {'author': 'User', 'assignee': 'User'}
canDelete = False
requiredUrlAttrs = ['project_id']
Expand Down