From 770936f1f9b56010011c2af7f5f854d88f1c1d4f Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 21 Sep 2016 19:21:32 -0700 Subject: raise TypeError on invalid header assignment, fix #1562 --- netlib/strutils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'netlib/strutils.py') diff --git a/netlib/strutils.py b/netlib/strutils.py index 4cb3b805..d43c2aab 100644 --- a/netlib/strutils.py +++ b/netlib/strutils.py @@ -8,7 +8,10 @@ import six def always_bytes(unicode_or_bytes, *encode_args): if isinstance(unicode_or_bytes, six.text_type): return unicode_or_bytes.encode(*encode_args) - return unicode_or_bytes + elif isinstance(unicode_or_bytes, bytes) or unicode_or_bytes is None: + return unicode_or_bytes + else: + raise TypeError("Expected str or bytes, but got {}.".format(type(unicode_or_bytes).__name__)) def native(s, *encoding_opts): -- cgit v1.2.3