From 77c6064d22c0397c550daa9b121d6a11001909da Mon Sep 17 00:00:00 2001 From: Brishen Date: Fri, 31 Jan 2020 12:14:41 -0700 Subject: [PATCH 1/4] Update compat.py --- rest_framework_yaml/compat.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rest_framework_yaml/compat.py b/rest_framework_yaml/compat.py index 9f6c147..9ab839a 100644 --- a/rest_framework_yaml/compat.py +++ b/rest_framework_yaml/compat.py @@ -3,8 +3,7 @@ versions of django/python, and compatibility wrappers around optional packages. """ # flake8: noqa - -from django.utils import six +import six try: import yaml except ImportError: From 1bb0a3de8ff6e4dc4d3ec0ca77ecd5250d7c80db Mon Sep 17 00:00:00 2001 From: Brishen Date: Fri, 31 Jan 2020 12:15:20 -0700 Subject: [PATCH 2/4] Update encoders.py --- rest_framework_yaml/encoders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework_yaml/encoders.py b/rest_framework_yaml/encoders.py index 0dc0587..9d80e52 100644 --- a/rest_framework_yaml/encoders.py +++ b/rest_framework_yaml/encoders.py @@ -5,7 +5,7 @@ import decimal import types -from django.utils import six +import six from uuid import UUID from .compat import ( yaml, yaml_represent_text, Hyperlink, OrderedDict, ReturnDict, ReturnList From 739b52e78ae648f12887e3f11d3e642ac1512628 Mon Sep 17 00:00:00 2001 From: Brishen Date: Fri, 31 Jan 2020 12:15:34 -0700 Subject: [PATCH 3/4] Update parsers.py --- rest_framework_yaml/parsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework_yaml/parsers.py b/rest_framework_yaml/parsers.py index 2fbb744..8315347 100644 --- a/rest_framework_yaml/parsers.py +++ b/rest_framework_yaml/parsers.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.conf import settings -from django.utils import six +import six from rest_framework.exceptions import ParseError from rest_framework.parsers import BaseParser From 1388c89800e9e6afeb9eeda2bec404e920f1f198 Mon Sep 17 00:00:00 2001 From: Brishen Date: Fri, 31 Jan 2020 12:17:19 -0700 Subject: [PATCH 4/4] Update requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 96f0a23..6083d1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,3 +13,4 @@ wheel==0.24.0 # MkDocs for documentation previews/deploys mkdocs==0.11.1 +six==1.14.0