# HG changeset patch
# User rbernard
# Date 1265750408 -3600
# Node ID f436e2fef07658d5bea9df392bcbfc8445e1d53d
# Parent  8cb89c1531403230618357e5c109df3c0043b714# Parent  e4746a10edf5ac1bcea7348d228fb35bebf93657
Merge with e4746a10edf5ac1bcea7348d228fb35bebf93657

diff -r e4746a10edf5 -r f436e2fef076 src/cm/models.py
--- a/src/cm/models.py	Mon Feb 08 10:16:40 2010 +0100
+++ b/src/cm/models.py	Tue Feb 09 22:20:08 2010 +0100
@@ -139,6 +139,10 @@
 
 class TextVersionManager(KeyManager):
 
+    def save(self):
+        self.content = re.sub(r'\r\n|\r|\n', '\n', self.content)
+        super.save() 
+            
     def duplicate(self, text_version, duplicate_comments=True):
         #import pdb;pdb.set_trace()
         old_comment_set = set(text_version.comment_set.all())
diff -r e4746a10edf5 -r f436e2fef076 src/cm/utils/html.py
--- a/src/cm/utils/html.py	Mon Feb 08 10:16:40 2010 +0100
+++ b/src/cm/utils/html.py	Tue Feb 09 22:20:08 2010 +0100
@@ -19,12 +19,3 @@
 # utilities    
 def get_text_nodes(soup):
     return soup(text=lambda text:not isinstance(text, Comment))
-
-
-import re
-
-def cleanup_textarea(input):
-    """
-    Cleanup \r\n to standard \n    
-    """
-    return re.sub('(\r\n)|(\n)|(\r)','\n',input)
\ No newline at end of file
diff -r e4746a10edf5 -r f436e2fef076 src/cm/views/texts.py
--- a/src/cm/views/texts.py	Mon Feb 08 10:16:40 2010 +0100
+++ b/src/cm/views/texts.py	Tue Feb 09 22:20:08 2010 +0100
@@ -13,7 +13,6 @@
 from cm.utils import get_among, get_among, get_int
 from cm.utils.comment_positioning import compute_new_comment_positions, \
     insert_comment_markers
-from cm.utils.html import cleanup_textarea
 from cm.utils.spannifier import spannify
 from cm.views import get_keys_from_dict, get_textversion_by_keys_or_404, get_text_by_keys_or_404, redirect
 from cm.views.export import content_export2, content_export
@@ -474,7 +473,7 @@
     v1 = get_textversion_by_keys_or_404(v1_version_key, key=key)
     v2 = get_textversion_by_keys_or_404(v2_version_key, key=key)
 
-    content = get_uniffied_inner_diff_table(cleanup_textarea(v1.content), cleanup_textarea(v2.content))
+    content = get_uniffied_inner_diff_table(v1.content, v2.content)
     if mode=='1':
         # alternate diff
         from cm.utils.diff import text_diff