summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Maranchuk <slav0nic@python.su>2020-04-18 12:15:40 +0300
committerSergey Maranchuk <slav0nic@python.su>2020-04-19 00:53:53 +0300
commitc7d9440a73dcf3970961c661855b1d92ee26ce86 (patch)
tree1e50d72b076ad2c77ef6fba723a0e013e3022129
parentabbb9a5fafbd097e463ab4fdc9947da22be20f6b (diff)
downloadpyramid-c7d9440a73dcf3970961c661855b1d92ee26ce86.tar.gz
pyramid-c7d9440a73dcf3970961c661855b1d92ee26ce86.tar.bz2
pyramid-c7d9440a73dcf3970961c661855b1d92ee26ce86.zip
remove __unicode__ method
-rw-r--r--src/pyramid/httpexceptions.py2
-rw-r--r--tests/test_httpexceptions.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/pyramid/httpexceptions.py b/src/pyramid/httpexceptions.py
index c8af559e3..9fd5f7d55 100644
--- a/src/pyramid/httpexceptions.py
+++ b/src/pyramid/httpexceptions.py
@@ -143,8 +143,6 @@ def _no_escape(value):
if value is None:
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/tests/test_httpexceptions.py b/tests/test_httpexceptions.py
index a246dbaa6..73469778a 100644
--- a/tests/test_httpexceptions.py
+++ b/tests/test_httpexceptions.py
@@ -75,7 +75,7 @@ class Test__no_escape(unittest.TestCase):
def test_unicode(self):
class DummyUnicodeObject:
- def __unicode__(self):
+ def __str__(self):
return text_('42')
duo = DummyUnicodeObject()