UI/DiffDialog.py

changeset 2965
d133c7edd88a
parent 2580
7403bc14ea26
child 3012
d177226027e2
--- a/UI/DiffDialog.py	Sun Sep 29 15:54:10 2013 +0200
+++ b/UI/DiffDialog.py	Sun Sep 29 18:22:08 2013 +0200
@@ -108,7 +108,7 @@
 
 def context_diff(a, b, fromfile='', tofile='',
                  fromfiledate='', tofiledate='', n=3, lineterm='\n'):
-    """
+    r"""
     Compare two sequences of lines; generate the delta as a context diff.
 
     Context diffs are a compact way of showing line changes and a few
@@ -161,7 +161,6 @@
     @param lineterm line termination string (string)
     @return a generator yielding lines of differences
     """
-
     started = False
     prefixmap = {'insert': '+ ', 'delete': '- ', 'replace': '! ', 'equal': '  '}
     for group in SequenceMatcher(None, a, b).get_grouped_opcodes(n):
@@ -201,6 +200,8 @@
     def __init__(self, parent=None):
         """
         Constructor
+        
+        @param parent reference to the parent widget (QWidget)
         """
         super().__init__(parent)
         self.setupUi(self)

eric ide

mercurial