Skip to content

Commit

Permalink
feat: Rename function with a proper name
Browse files Browse the repository at this point in the history
Misleading name for the function. It does not envolve JSON processing.
  • Loading branch information
mauricioabreu committed Jun 3, 2018
1 parent 1abfce3 commit 42cd0aa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions azion/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from azion.models import (
Configuration, Token, as_boolean,
decode_json, filter_none, instance_from_json, many_of)
decode_json, filter_none, instance_from_data, many_of)


class AuthToken(requests.auth.AuthBase):
Expand Down Expand Up @@ -91,7 +91,7 @@ def authorize(self, username, password):
url = self.session.build_url('tokens')
response = self.session.post(url, data={}, auth=(username, password))
json = decode_json(response, 201)
return instance_from_json(Token, json)
return instance_from_data(Token, json)

def get_configuration(self, configuration_id):
"""Retrieve a configuration.
Expand All @@ -102,7 +102,7 @@ def get_configuration(self, configuration_id):
'content_delivery', 'configurations', configuration_id)
response = self.session.get(url)
json = decode_json(response, 200)
return instance_from_json(Configuration, json)
return instance_from_data(Configuration, json)

def list_configurations(self):
"""List configurations."""
Expand Down Expand Up @@ -161,7 +161,7 @@ def create_configuration(self, name, origin_address, origin_host_header,
url = self.session.build_url('content_delivery', 'configurations')
response = self.session.post(url, json=filter_none(data))
json = decode_json(response, 201)
return instance_from_json(Configuration, json)
return instance_from_data(Configuration, json)

def delete_configuration(self, configuration_id):
"""Delete a configuration.
Expand Down Expand Up @@ -215,7 +215,7 @@ def partial_update_configuration(self, configuration_id, name=None,
'content_delivery', 'configurations', configuration_id)
response = self.session.patch(url, json=filter_none(data))
json = decode_json(response, 200)
return instance_from_json(Configuration, json)
return instance_from_data(Configuration, json)

def replace_configuration(self, configuration_id, name=None,
cname=None, cname_access_only=None,
Expand Down Expand Up @@ -259,4 +259,4 @@ def replace_configuration(self, configuration_id, name=None,
'content_delivery', 'configurations', configuration_id)
response = self.session.put(url, json=filter_none(data))
json = decode_json(response, 200)
return instance_from_json(Configuration, json)
return instance_from_data(Configuration, json)
4 changes: 2 additions & 2 deletions azion/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from azion import exceptions


def instance_from_json(model, data):
def instance_from_data(model, data):
if not data:
return None
return model(data)
Expand All @@ -12,7 +12,7 @@ def instance_from_json(model, data):
def many_of(model, data):
if not data:
return []
return [instance_from_json(model, resource) for
return [instance_from_data(model, resource) for
resource in data]


Expand Down
4 changes: 2 additions & 2 deletions tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ def test_filter_none(self):
data = {'foo': False, 'bar': None}
assert models.filter_none(data) == {'foo': False}

def test_instance_from_json(self):
def test_instance_from_data(self):

class DummyModel(object):

def __init__(self, data):
self.data = data

instance = models.instance_from_json(
instance = models.instance_from_data(
DummyModel, {'foobar': 1})
assert isinstance(instance, DummyModel)

Expand Down

0 comments on commit 42cd0aa

Please sign in to comment.