[Erp5-report] r37860 aurel - /erp5/trunk/products/ERP5Type/DiffUtils.py

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Aug 17 11:27:57 CEST 2010


Author: aurel
Date: Tue Aug 17 11:27:56 2010
New Revision: 37860

URL: http://svn.erp5.org?rev=37860&view=rev
Log:
change format of data returned by the method so that we can later
access subblocks

Modified:
    erp5/trunk/products/ERP5Type/DiffUtils.py

Modified: erp5/trunk/products/ERP5Type/DiffUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DiffUtils.py?rev=37860&r1=37859&r2=37860&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DiffUtils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/DiffUtils.py [utf8] Tue Aug 17 11:27:56 2010
@@ -149,7 +149,7 @@ class DiffFile:
   def getModifiedBlockList(self):
     """
     Return a list of modified blocks
-    List contains tuples (old_modified_code, new_modified_code)
+    List contains tuples (block object : (old_modified_code, new_modified_code))
     """
     if self.binary:
       return []
@@ -159,7 +159,8 @@ class DiffFile:
                        if x[0] is not None and x[1] == MODIFIED_DIFF_COLOR]
       new_line_list = [x[0].strip() for x in child.getNewCodeList()
                        if x[0] is not None and x[1] == MODIFIED_DIFF_COLOR]
-      block_list.append((old_line_list, new_line_list))
+      if old_line_list and new_line_list:
+        block_list.append((child,(old_line_list, new_line_list)))
     return block_list
 
 




More information about the Erp5-report mailing list