# HG changeset patch
# User raph
# Date 1273485008 -7200
# Node ID e49623f99d02011b70494565600e50d3b230d901
# Parent  05d59fd34d00659059c9c349be0ae6cf3225dc55
import inside function

diff -r 05d59fd34d00 -r e49623f99d02 src/cm/views/texts.py
--- a/src/cm/views/texts.py	Fri May 07 14:26:24 2010 +0200
+++ b/src/cm/views/texts.py	Mon May 10 11:50:08 2010 +0200
@@ -15,7 +15,6 @@
 from cm.utils.comment_positioning import compute_new_comment_positions, \
     insert_comment_markers
 from cm.utils.spannifier import spannify
-from cm.utils.diff import diff_match_patch2
 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
 from cm.views.user import AnonUserRoleForm, cm_login
@@ -501,6 +500,7 @@
     if mode=='1':
         # alternate diff
         #from cm.utils.diff import text_diff
+        from cm.utils.diff import diff_match_patch2        
         dif = diff_match_patch2()
         content = dif.diff_prettyHtml_one_way(dif.diff_main(v1.get_content(), v2.get_content()), mode='ins_del')
 
@@ -595,7 +595,8 @@
                 minus, plus = diff_decorate(minus, plus)
                 
                 
-                minus, plus = '<br />'.join(minus), '<br />'.join(plus)                
+                minus, plus = '<br />'.join(minus), '<br />'.join(plus)
+                from cm.utils.diff import diff_match_patch2
                 dif = diff_match_patch2()
                 res_diff1 = dif.diff_main(minus, plus)
                 dif.diff_cleanupSemantic(res_diff1)