From 805283fe388c40b3e51472a834a85a0bbde9cfec Mon Sep 17 00:00:00 2001 From: shuma Date: Wed, 2 Aug 2017 10:35:05 +0400 Subject: [PATCH] fix --- rest_framework/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 4ad7d4af8..cb1d40369 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -577,8 +577,8 @@ class Field(object): """ A helper method that simply raises a validation error. """ - if hasattr(api_settings, 'global_error_messages'): - self.error_messages.update(api_settings['global_error_messages']) + if 'GLOBAL_ERROR_MESSAGES' in api_settings.user_settings.keys(): + self.error_messages.update(api_settings.user_settings['GLOBAL_ERROR_MESSAGES']) try: msg = self.error_messages[key] except KeyError: