From 763aab6b457370897d32c36d895a70cb0e980c28 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 5 Apr 2016 16:29:16 +0200 Subject: [PATCH 1/2] Fix the string_types / text_types confusion introduced in #4025 --- rest_framework/authentication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 23ef49d69f..eb81406432 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -7,7 +7,7 @@ from django.contrib.auth import authenticate, get_user_model from django.middleware.csrf import CsrfViewMiddleware -from django.utils.six import string_types +from django.utils.six import text_types from django.utils.translation import ugettext_lazy as _ from rest_framework import HTTP_HEADER_ENCODING, exceptions @@ -20,7 +20,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, string_types): + if isinstance(auth, text_types): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth From 2622588b30c14a2bfab2838058138c7750cd8fd9 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Thu, 7 Apr 2016 18:00:17 +0200 Subject: [PATCH 2/2] Typo correction. --- rest_framework/authentication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index eb81406432..63d302bc22 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -7,7 +7,7 @@ from django.contrib.auth import authenticate, get_user_model from django.middleware.csrf import CsrfViewMiddleware -from django.utils.six import text_types +from django.utils.six import text_type from django.utils.translation import ugettext_lazy as _ from rest_framework import HTTP_HEADER_ENCODING, exceptions @@ -20,7 +20,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, text_types): + if isinstance(auth, text_type): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy