Skip to content

Commit

Permalink
Rename a few more private methods
Browse files Browse the repository at this point in the history
  • Loading branch information
Gauvain Pocentek committed May 13, 2015
1 parent d7bea07 commit bed3adf
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions gitlab/__init__.py
Expand Up @@ -197,7 +197,7 @@ def _construct_url(self, id_, obj, parameters):
url = '%s%s' % (self._url, url)
return url

def _createHeaders(self, content_type=None, headers={}):
def _create_headers(self, content_type=None, headers={}):
request_headers = self.headers.copy()
request_headers.update(headers)
if content_type is not None:
Expand Down Expand Up @@ -236,7 +236,7 @@ def rawGet(self, path, content_type=None, **kwargs):

def _raw_get(self, path, content_type=None, **kwargs):
url = '%s%s' % (self._url, path)
headers = self._createHeaders(content_type)
headers = self._create_headers(content_type)

try:
return requests.get(url,
Expand All @@ -254,7 +254,7 @@ def rawPost(self, path, data=None, content_type=None, **kwargs):

def _raw_post(self, path, data=None, content_type=None, **kwargs):
url = '%s%s' % (self._url, path)
headers = self._createHeaders(content_type)
headers = self._create_headers(content_type)
try:
return requests.post(url, params=kwargs, data=data,
headers=headers,
Expand All @@ -270,7 +270,7 @@ def rawPut(self, path, data=None, content_type=None, **kwargs):

def _raw_put(self, path, data=None, content_type=None, **kwargs):
url = '%s%s' % (self._url, path)
headers = self._createHeaders(content_type)
headers = self._create_headers(content_type)

try:
return requests.put(url, data=data, params=kwargs,
Expand All @@ -287,7 +287,7 @@ def rawDelete(self, path, content_type=None, **kwargs):

def _raw_delete(self, path, content_type=None, **kwargs):
url = '%s%s' % (self._url, path)
headers = self._createHeaders(content_type)
headers = self._create_headers(content_type)

try:
return requests.delete(url,
Expand All @@ -310,7 +310,7 @@ def list(self, obj_class, **kwargs):
", ".join(missing))

url = self._construct_url(id_=None, obj=obj_class, parameters=kwargs)
headers = self._createHeaders()
headers = self._create_headers()

# Remove attributes that are used in url so that there is only
# url-parameters left
Expand Down Expand Up @@ -358,7 +358,7 @@ def get(self, obj_class, id=None, **kwargs):
", ".join(missing))

url = self._construct_url(id_=id, obj=obj_class, parameters=kwargs)
headers = self._createHeaders()
headers = self._create_headers()

# Remove attributes that are used in url so that there is only
# url-parameters left
Expand Down Expand Up @@ -391,7 +391,7 @@ def delete(self, obj, **kwargs):
", ".join(missing))

url = self._construct_url(id_=obj.id, obj=obj, parameters=params)
headers = self._createHeaders()
headers = self._create_headers()

# Remove attributes that are used in url so that there is only
# url-parameters left
Expand Down Expand Up @@ -426,10 +426,10 @@ def create(self, obj, **kwargs):
", ".join(missing))

url = self._construct_url(id_=None, obj=obj, parameters=params)
headers = self._createHeaders(content_type="application/json")
headers = self._create_headers(content_type="application/json")

# build data that can really be sent to server
data = obj._dataForGitlab(extra_parameters=kwargs)
data = obj._data_for_gitlab(extra_parameters=kwargs)

try:
r = requests.post(url, data=data,
Expand Down Expand Up @@ -457,10 +457,10 @@ def update(self, obj, **kwargs):
raise GitlabUpdateError('Missing attribute(s): %s' %
", ".join(missing))
url = self._construct_url(id_=obj.id, obj=obj, parameters=params)
headers = self._createHeaders(content_type="application/json")
headers = self._create_headers(content_type="application/json")

# build data that can really be sent to server
data = obj._dataForGitlab(extra_parameters=kwargs)
data = obj._data_for_gitlab(extra_parameters=kwargs)

try:
r = requests.put(url, data=data,
Expand Down Expand Up @@ -646,7 +646,7 @@ class GitlabObject(object):
idAttr = 'id'
shortPrintAttr = None

def _dataForGitlab(self, extra_parameters={}):
def _data_for_gitlab(self, extra_parameters={}):
data = {}
for attribute in itertools.chain(self.requiredCreateAttrs,
self.optionalCreateAttrs):
Expand Down Expand Up @@ -1002,7 +1002,7 @@ class ProjectIssue(GitlabObject):

shortPrintAttr = 'title'

def _dataForGitlab(self, extra_parameters={}):
def _data_for_gitlab(self, extra_parameters={}):
# Gitlab-api returns labels in a json list and takes them in a
# comma separated list.
if hasattr(self, "labels"):
Expand All @@ -1011,7 +1011,7 @@ def _dataForGitlab(self, extra_parameters={}):
labels = ", ".join(self.labels)
extra_parameters['labels'] = labels

return super(ProjectIssue, self)._dataForGitlab(extra_parameters)
return super(ProjectIssue, self)._data_for_gitlab(extra_parameters)

def Note(self, id=None, **kwargs):
return ProjectIssueNote._get_list_or_object(self.gitlab, id,
Expand Down

0 comments on commit bed3adf

Please sign in to comment.