Commitdd3b47c

committed

Merge pull request#4025 from dnit/master

type('') to str

2 parents3d3b064 +09aa8f7 commitdd3b47cCopy full SHA for dd3b47c

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`fromdjango.contrib.authimportauthenticate,get_user_model`
`9`	`9`	`fromdjango.middleware.csrfimportCsrfViewMiddleware`
	`10`	`+fromdjango.utils.siximportstring_types`
`10`	`11`	`fromdjango.utils.translationimportugettext_lazyas_`
`11`	`12`
`12`	`13`	`fromrest_frameworkimportHTTP_HEADER_ENCODING,exceptions`
`@@ -19,7 +20,7 @@ def get_authorization_header(request):`
`19`	`20`	`Hide some test client ickyness where the header can be unicode.`
`20`	`21`	`"""`
`21`	`22`	`auth=request.META.get('HTTP_AUTHORIZATION',b'')`
`22`		`-ifisinstance(auth,type('')):`
	`23`	`+ifisinstance(auth,string_types):`
`23`	`24`	`# Work around django test client oddness`
`24`	`25`	`auth=auth.encode(HTTP_HEADER_ENCODING)`
`25`	`26`	`returnauth`

Comments

(0)