Ticket #7025: 7025.diff

django/utils/safestring.py

@@ -55 +55 @@
             return SafeUnicode(data)
 
     decode = curry(_proxy_method, method = str.decode)
+    lstrip = curry(_proxy_method, method = str.lstrip)
+    rstrip = curry(_proxy_method, method = str.rstrip)
+    strip = curry(_proxy_method, method = str.strip)
+    
+    def splitlines(self, keepends=False):
+        """
+        This fails on newlines in CDATA sections.
+        """
+        return [SafeString(part) for part in str.splitlines(self, keepends)]
 
 class SafeUnicode(unicode, SafeData):
     """
@@ -85 +94 @@
             return SafeUnicode(data)
 
     encode = curry(_proxy_method, method = unicode.encode)
+    lstrip = curry(_proxy_method, method = unicode.lstrip)
+    rstrip = curry(_proxy_method, method = unicode.rstrip)
+    strip = curry(_proxy_method, method = unicode.strip)
+    
+    def splitlines(self, keepends=False):
+        """
+        This fails on newlines in CDATA sections.
+        """
+        return [SafeUnicode(part) for part in unicode.splitlines(self, keepends)]
 
 def mark_safe(s):
     """

tests/regressiontests/utils/tests.py

@@ -4 +4 @@
 
 from unittest import TestCase
 
-from django.utils import html, checksums
+from django.utils import html, checksums, safestring
 
 import timesince
 import datastructures
@@ -150 +150 @@
         for value, output in items:
             self.check_output(f, value, output)
 
+class TestUtilsSafeString(TestCase):
+
+    def test_safestring_splitlines(self):
+        safe = safestring.SafeString('one\ntwo\three\n')
+        for sub in safe.splitlines():
+            self.failUnless(isinstance(sub, safestring.SafeString), repr(sub))
+
+    def test_safeunicode_splitlines(self):
+        safe = safestring.SafeUnicode(u'one\ntwo\three\n')
+        for sub in safe.splitlines():
+            self.failUnless(isinstance(sub, safestring.SafeUnicode), repr(sub))
+           
+    def test_safestring_strip(self):
+        safe = safestring.SafeString(' \none\n ')
+
+        stripped = safe.strip()
+        self.failUnless(isinstance(stripped, safestring.SafeString) and stripped=='one')
+
+        stripped = safe.rstrip()
+        self.failUnless(isinstance(stripped, safestring.SafeString) and stripped==' \none')
+
+        stripped = safe.lstrip()
+        self.failUnless(isinstance(stripped, safestring.SafeString) and stripped=='one\n ')
+        
+    def test_safeunicode_strip(self):
+        safe = safestring.SafeUnicode(' \none\n ')
+        
+        stripped = safe.strip()
+        self.failUnless(isinstance(stripped, safestring.SafeUnicode) and stripped=='one')
+        
+        stripped = safe.rstrip()
+        self.failUnless(isinstance(stripped, safestring.SafeUnicode) and stripped==' \none')
+        
+        stripped = safe.lstrip()
+        self.failUnless(isinstance(stripped, safestring.SafeUnicode) and stripped=='one\n ')
+        
+
 if __name__ == "__main__":
     import doctest
     doctest.testmod()