From 99d120b2e4e281f08fe21709074455f63a618993 Mon Sep 17 00:00:00 2001 From: Levi Payne Date: Wed, 4 Oct 2017 20:45:27 -0400 Subject: [PATCH] Move postgres_fields import out of compat.py --- rest_framework/compat.py | 9 --------- rest_framework/serializers.py | 8 +++++++- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 14f2ae6e5..914beab77 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -115,15 +115,6 @@ def _resolve_model(obj): raise ValueError("{0} is not a Django model".format(obj)) - -# TODO: Remove -# contrib.postgres only supported from 1.8 onwards. -try: - from django.contrib.postgres import fields as postgres_fields -except ImportError: - postgres_fields = None - - # TODO: Remove # JSONField is only supported from 1.9 onwards try: diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b1c34b92a..9a231830e 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -28,7 +28,7 @@ from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import JSONField as ModelJSONField -from rest_framework.compat import postgres_fields, set_many, unicode_to_repr +from rest_framework.compat import set_many, unicode_to_repr from rest_framework.exceptions import ErrorDetail, ValidationError from rest_framework.fields import get_error_detail, set_value from rest_framework.settings import api_settings @@ -46,6 +46,12 @@ from rest_framework.validators import ( UniqueTogetherValidator ) +try: + from django.contrib.postgres import fields as postgres_fields +except ImportError: + postgres_fields = None + + # Note: We do the following so that users of the framework can use this style: # # example_field = serializers.CharField(...)