diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2020-01-21 22:43:18 -0800 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2020-11-28 12:19:53 -0800 |
| commit | 5239a8f4663884063e55cff022a66cfd144e2996 (patch) | |
| tree | 1d4da59811795010a5f1d0a2a05a005d131dc0fa /src | |
| parent | 03bc46292de9fe9ae462efd5509f2375bb5a5495 (diff) | |
| download | webob-5239a8f4663884063e55cff022a66cfd144e2996.tar.gz | |
Remove __unicode__
Diffstat (limited to 'src')
| -rw-r--r-- | src/webob/exc.py | 3 | ||||
| -rw-r--r-- | src/webob/util.py | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/webob/exc.py b/src/webob/exc.py index 48d372b..5ca71b9 100644 --- a/src/webob/exc.py +++ b/src/webob/exc.py @@ -202,9 +202,6 @@ def no_escape(value): return "" if not isinstance(value, str): - if hasattr(value, "__unicode__"): - value = value.__unicode__() - if isinstance(value, bytes): value = text_(value, "utf-8") else: diff --git a/src/webob/util.py b/src/webob/util.py index 7a3331f..3f8289f 100644 --- a/src/webob/util.py +++ b/src/webob/util.py @@ -37,12 +37,7 @@ def html_escape(s): return s.__html__() if not isinstance(s, str): - __unicode__ = getattr(s, "__unicode__", None) - - if __unicode__ is not None and callable(__unicode__): - s = s.__unicode__() - else: - s = str(s) + s = str(s) s = escape(s, True) if isinstance(s, str): |