Skip to content
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into liquidpele-patch-2
Conflicts:
	djangosaml2/views.py
  • Loading branch information
Reece authored and Reece committed Apr 10, 2017
commit d515d6c6ab99e66f3d1eb0062dea6d45ae8e9a2c
2 changes: 1 addition & 1 deletion djangosaml2/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def login(request,
)
except TypeError as e:
logger.error('Unable to know which IdP to use')
return HttpResponse(unicode(e))
return HttpResponse(text_type(e))
except UnsupportedBinding as e:
logger.error('%s: sp_authn_requests_signed=%s and dictates the binding chosen, ensure it matches what the IDP metadata allows' % (
e, getattr(conf, '_sp_authn_requests_signed', False)))
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.