Mercurial Repositories > eric / file diff

--- a/eric6/UI/CompareDialog.py	Sun Jan 17 13:53:08 2021 +0100
+++ b/eric6/UI/CompareDialog.py	Mon Feb 01 10:38:16 2021 +0100
@@ -34,8 +34,7 @@
     @param a first sequence of lines (list of strings)
     @param b second sequence of lines (list of strings)
     @param linenumberwidth width (in characters) of the linenumbers (integer)
-    @return a generator yielding tuples of differences. The tuple is composed
-        of strings as follows.
+    @yield tuples of differences. Each tuple is composed of strings as follows.
         <ul>
             <li>opcode -- one of e, d, i, r for equal, delete, insert,
                 replace</li>
@@ -44,7 +43,9 @@
             <li>lineno b -- linenumber of sequence b</li>
             <li>line b -- line of sequence b</li>
         </ul>
+    @ytype tuple of (str, str, str, str, str)
     """
+    # __IGNORE_WARNING_D234r__
     def removeMarkers(line):
         """
         Internal function to remove all diff markers.
@@ -269,8 +270,8 @@
         
         @param lines1 text to compare against (string or list of strings)
         @param lines2 text to compare (string or list of strings)
-        @keyparam name1 name to be shown for the first text (string)
-        @keyparam name2 name to be shown for the second text (string)
+        @param name1 name to be shown for the first text (string)
+        @param name2 name to be shown for the second text (string)
         """
         if name1 == "" or name2 == "":
             self.filesGroup.hide()