From 9286a92dc48bd4264de22c8cb7a6ae1d8ee73383 Mon Sep 17 00:00:00 2001
From: kunwen01 <kunwen01@outlook.com>
Date: Thu, 24 Mar 2022 11:39:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7Django=E5=88=B03.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dvadmin-backend/apps/vadmin/op_drf/filters.py  |   6 +++---
 .../apps/vadmin/utils/authentication.py        |   4 ++--
 dvadmin-backend/requirements.txt               | Bin 656 -> 3542 bytes
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dvadmin-backend/apps/vadmin/op_drf/filters.py b/dvadmin-backend/apps/vadmin/op_drf/filters.py
index b250cd3..62b1b9b 100644
--- a/dvadmin-backend/apps/vadmin/op_drf/filters.py
+++ b/dvadmin-backend/apps/vadmin/op_drf/filters.py
@@ -6,7 +6,7 @@ import logging
 import operator
 from functools import reduce
 
-from django.utils import six
+# from django.utils import six
 from mongoengine.queryset import visitor
 from rest_framework.filters import BaseFilterBackend, SearchFilter, OrderingFilter
 
@@ -34,7 +34,7 @@ class MongoSearchFilter(SearchFilter):
         if not search_fields or not search_terms:
             return queryset
         orm_lookups = [
-            self.construct_search(six.text_type(search_field))
+            self.construct_search(str(search_field))
             for search_field in search_fields
         ]
         if not orm_lookups:
@@ -67,7 +67,7 @@ class MongoOrderingFilter(OrderingFilter):
             ]
         else:
             valid_fields = [
-                (item, item) if isinstance(item, six.string_types) else item
+                (item, item) if isinstance(item, str) else item
                 for item in valid_fields
             ]
 
diff --git a/dvadmin-backend/apps/vadmin/utils/authentication.py b/dvadmin-backend/apps/vadmin/utils/authentication.py
index 3187058..2a61cb9 100644
--- a/dvadmin-backend/apps/vadmin/utils/authentication.py
+++ b/dvadmin-backend/apps/vadmin/utils/authentication.py
@@ -7,7 +7,7 @@ import jwt
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.cache import cache
-from django.utils.six import text_type
+# from django.utils.six import text_type
 from django.utils.translation import ugettext as _
 from rest_framework import exceptions
 from rest_framework_jwt.utils import jwt_decode_handler
@@ -61,7 +61,7 @@ class OpAuthJwtAuthentication(object):
         :return:
         """
         auth = request.META.get('HTTP_AUTHORIZATION', b'')
-        if isinstance(auth, text_type):
+        if isinstance(auth, str):
             auth = auth.encode(settings.JWT_AUTH.get('HTTP_HEADER_ENCODING', 'iso-8859-1'))
         if not auth:
             return ''
diff --git a/dvadmin-backend/requirements.txt b/dvadmin-backend/requirements.txt
index 9b36e47c9a4e1291e84df1d33f12c59cc0dd6f5b..a45bce646eb8059ee146e238eb8d8281c65d8af8 100644
GIT binary patch
literal 3542
zcmZ{nOK%%T5QOI(AU|b^kg{d@kV62Uj07=Y136PmN}|n|m!$Rh@k#3I+ScsS5(q+q
zx~IFky1Hld-@o&+D!bB^Wm)LAL-}2wX_=G@eW&Hu@=KYQP5EB-VR;*Wos{2t%c0!r
z6sK>(&MADV{jqFITbgo|-$s7Ba?<Z)c@ut<GV5a<_4lqvFbfR!Fa}QT%C*qkDI(`*
z`fxfU{1K6N$};aW%!I=p#&azUYkgMo=u|IJKzylh&D9F!THmfbh6nYK<sxum?G%5d
zidSJLi}6k)-&OB-^Xvhi(*ZB7YM85vZDca%-~jEL{`A<RQO;q9@E#(@8}61u)+jC=
zg$HVV3dCm2Ii|u3t8LiZ@-6DPIzzx&Y)vR*AvWk8Jp?=Pz-!#&XpPjemM_}a4m4#R
z&V8v2|BMLN?pLdf>!<|{&YwM~JbBthhGSql%G*6N+vKZ}$TL@_?3%G>S3Ls<ReUGE
zVYXpc(8NBJcq@j9cGqXT2o+gxRJiD^^f+}^tskOh5Vi6<>ZjERV(OpvYWq;W%Dxqo
zyXPqG-C|&A6s2mm(UefBr_A$_vwVJvst@WgHP3|sZC5=`V+zgS_$1n22ktI#rT$%c
z#f)x^p9-zwgIIId%#2ydPL1=7RiBgi5+XbgLeyyL$cawxLpvyV6B%J~8Em4<+86ZX
zT{q5tP?Z~@WgEaT{XT|5susNw-^DzQPv^#airhqiHTvXUleO-Z;n}R^=SosZ=;I~K
zub*tBm-}85p2IpFi<qIklzfyD=nZ+!mD34-Bm58Yf<@SIA9Hfw4KUgJQJir{;9+gk
zZTD|kencFmmc5lxE(SY=DO-kD^)Y(5Lv43Lfls}?z+JO2pL^LmWufcdb=GV3TIu{&
zSiu0Z-U|4)5gj#cg^`VlkI&cLhv!Yy(aOubWIa|0SXZ(cO}%H07VF2r$L!3Wae&ZR
zzKTcK-pfvxGWu1|!#7zsn*38(a#Fk{|I(RGm7jF_vwpu(HLd~;rH)>o5m3zHzVVc7
zqNgCqyTe*atQ%E%(3@c`JFJ_#VMZ%p8}|vi!)ATdiP%No=)e!@?p&Qr4^{HL>~Dia
zH1BU7>n?i*$Df3T7r;)lK+g9%O?9qoFP31DDd)wq(`PN-=o{YdH(dCR->XXACB(!I
z7Dpr(h*AGm(Xo;T)OogAy`L6}h03iBb3XKL6)|u5+`3>f_D{<8vHVlML@v0j(+HB<
zU9f<|84~H=icX(C>+@&C@cRlccZ(>A0KJ>t<ir~gpWGpAO!)NNT=y~k+Nu$&H#a7m
zWymOM;9cTbcl4(|60a`ou7A7(a<@7Uw(pAT8^Zi@ayH<olijz*S{8b<>AMO8)9_5L
zU-q5!YImjCzsuNCyv#c3m=_f{0sF>N;hjKFtW!@CU17gIM6LX7+P^PsVYadt^%iy2
zczlt*dCk|CMSU%sljFz(L_1-#qWAjA%fPBPqU^y@nEXG3F`LKig7=%%@%mi>PS*rh
zcxS%H+BWM|eJA08E8b?@$ks|~c^HjN&(^utykf^T3-;beFHYixZZwK<+jn88iPSsY
z%2xuDU9sGYDfnFoPu;{Y@isEtE4tqbnSa_(9Q8g3UH<pM8CRN?;T>J?7v2!e=Oi$}
Q0{1KX*WCx7XPP+w0|#mee*gdg

literal 656
zcmZuvJ8#1v5Z?JOAloEq7Pd~EGF0jqQTt+(5}@Eb++W}C>?Bg9j>p}7ufvw!WjYw6
zl~%QA$y1(;S*uE|#p}_AJ{r@gM%5e9&82K(E^;8-Q7*jqqN;mqzpU>+$&Sm`qazQ_
zkCgdw^&FQO@YKmnCB;z4m<mMCl}w!j!AjL&e~@E#l!t6jbdC8-o+1QN=v~0J2KIBX
zxKr{ZTbssqunfIcwZ6kJ$`gbaLDBrzlgBHZ)T*voS3XF(jTDN5T!v)p#}Y%b<G}T{
z5q}iH4{JY7<=eO3QJ7<?lomVZeY_g8RgAow-ag)$=LOSgnlWZsHAd4k{vf!jfedjE
zMZ=92#ocCcxRwAzvUv%SW4QT6xkm5ibH~wFc*pg~CdVaCF3yFrv^|u;5Z}2HbV20_
zQXv!$L@MXedHxhzv^j;zmY$iLiXUtmmiT!XVTV9|{uylaQRB+<IrYpD6NUC7VQq+k
LZwxzXy%FLUu0+cT