From 0eff8c80dcfcc29b478252fa652e3c4503a7d979 Mon Sep 17 00:00:00 2001 From: Jonathan Senecal Date: Tue, 15 Sep 2015 10:04:40 -0400 Subject: [PATCH] Revert "Prevent django from throwing errors if url is None" --- rest_framework_json_api/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework_json_api/utils.py b/rest_framework_json_api/utils.py index 77726699..9485628b 100644 --- a/rest_framework_json_api/utils.py +++ b/rest_framework_json_api/utils.py @@ -202,9 +202,9 @@ def extract_id_from_url(url): def extract_id(fields, resource): for field_name, field in six.iteritems(fields): if field_name == 'id': - return encoding.force_text(resource.get(field_name)) if resource.get(field_name) else None + return encoding.force_text(resource.get(field_name)) if field_name == api_settings.URL_FIELD_NAME: - return extract_id_from_url(resource.get(field_name)) if resource.get(field_name) else None + return extract_id_from_url(resource.get(field_name)) def extract_attributes(fields, resource):