summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-12-01 20:08:45 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-12-01 20:08:45 +0000
commitb2dbbd5bbc85d270dccea3af2aab3b551d174164 (patch)
tree95d1ebd77d43e86f87fc7a6bae389b38779489a7
parentf3d5372340a2baea9f29bcec93d2163fff3461a0 (diff)
Fixed #6021 -- Removed some brain damage from SafeString. Not quite sure what I
was smoking there. Thanks, Jan Rademaker. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/utils/safestring.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/django/utils/safestring.py b/django/utils/safestring.py
index f6f4c1eb2f..d8e44d7d09 100644
--- a/django/utils/safestring.py
+++ b/django/utils/safestring.py
@@ -41,9 +41,6 @@ class SafeString(str, SafeData):
else:
return super(SafeString, self).__add__(rhs)
- def __str__(self):
- return self
-
def _proxy_method(self, *args, **kwargs):
"""
Wrap a call to a normal unicode method up so that we return safe