Fix pylint messages in src/vcs

Author: MightyCreak

src/diffuse.in

@@ -21,13 +21,12 @@
 
 import sys
 import gettext
-import locale
 
-pkgdatadir = '@pkgdatadir@'
-localedir = '@localedir@'
+PKGDATADIR = '@pkgdatadir@'
+LOCALEDIR = '@localedir@'
 
-sys.path.insert(1, pkgdatadir)
-gettext.install('diffuse', localedir)
+sys.path.insert(1, PKGDATADIR)
+gettext.install('diffuse', LOCALEDIR)
 
 if __name__ == '__main__':
     from diffuse import main

src/main.py

@@ -55,10 +55,6 @@
 from diffuse import constants
 from diffuse.vcs.vcs_registry import VcsRegistry
 
-if not hasattr(__builtins__, 'WindowsError'):
-    # define 'WindowsError' so 'except' statements will work on all platforms
-    WindowsError = IOError
-
 # avoid some dictionary lookups when string.whitespace is used in loops
 # this is sorted based upon frequency to speed up code for stripping whitespace
 whitespace = ' \t\n\r\x0b\x0c'
@@ -131,38 +127,6 @@ def parse(self, state_name, s):
             start = end
         return state_name, blocks
 
-# split string into lines based upon DOS, Mac, and Unix line endings
-def splitlines(s):
-    # split on new line characters
-    temp, i, n = [], 0, len(s)
-    while i < n:
-        j = s.find('\n', i)
-        if j < 0:
-            temp.append(s[i:])
-            break
-        j += 1
-        temp.append(s[i:j])
-        i = j
-    # split on carriage return characters
-    ss = []
-    for s in temp:
-        i, n = 0, len(s)
-        while i < n:
-            j = s.find('\r', i)
-            if j < 0:
-                ss.append(s[i:])
-                break
-            j += 1
-            if j < n and s[j] == '\n':
-                j += 1
-            ss.append(s[i:j])
-            i = j
-    return ss
-
-# also recognise old Mac OS line endings
-def readlines(fd):
-    return strip_eols(splitlines(fd.read()))
-
 def readconfiglines(fd):
     return fd.read().replace('\r', '').split('\n')
 
@@ -1141,33 +1105,12 @@ def getFormat(ss):
                 flags |= UNIX_FORMAT
     return flags
 
-# returns the number of characters in the string excluding any line ending
-# characters
-def len_minus_line_ending(s):
-    if s is None:
-        return 0
-    n = len(s)
-    if s.endswith('\r\n'):
-        n -= 2
-    elif s.endswith('\r') or s.endswith('\n'):
-        n -= 1
-    return n
-
-# returns the string without the line ending characters
-def strip_eol(s):
-    if s is not None:
-        return s[:len_minus_line_ending(s)]
-
-# returns the list of strings without line ending characters
-def strip_eols(ss):
-    return [ strip_eol(s) for s in ss ]
-
 # convenience method to change the line ending of a string
 def convert_to_format(s, format):
     if s is not None and format != 0:
         old_format = getFormat([ s ])
         if old_format != 0 and (old_format & format) == 0:
-            s = strip_eol(s)
+            s = utils.strip_eol(s)
             # prefer the host line ending style
             if (format & DOS_FORMAT) and os.linesep == '\r\n':
                 s += os.linesep
@@ -1913,7 +1856,7 @@ def setFont(self, font):
     # This is an inline loop over self.characterWidth() for performance reasons.
     def stringWidth(self, s):
         if not self.prefs.getBool('display_show_whitespace'):
-            s = strip_eol(s)
+            s = utils.strip_eol(s)
         col = 0
         for c in s:
             try:
@@ -1965,7 +1908,7 @@ def characterWidth(self, i, c):
     def expand(self, s):
         visible = self.prefs.getBool('display_show_whitespace')
         if not visible:
-            s = strip_eol(s)
+            s = utils.strip_eol(s)
         tab_width = self.prefs.getInt('display_tab_width')
         col = 0
         result = []
@@ -2563,7 +2506,7 @@ def _alignmentHash(self, line):
             # hashes for non-null lines should start with '+' to distinguish
             # them from blank lines
             if pref('align_ignore_endofline'):
-                text = strip_eol(text)
+                text = utils.strip_eol(text)
             if pref('align_ignore_blanklines') and isBlank(text):
                 # consider all lines containing only white space as the same
                 return ''
@@ -2792,8 +2735,8 @@ def replaceText(self, text):
         if text is None:
             text = ''
         # split the replacement text into lines
-        ss = splitlines(text)
-        if len(ss) == 0 or len(ss[-1]) != len_minus_line_ending(ss[-1]):
+        ss = utils.splitlines(text)
+        if len(ss) == 0 or len(ss[-1]) != utils.len_minus_line_ending(ss[-1]):
             ss.append('')
         # change the format to that of the target pane
         if pane.format == 0:
@@ -2807,7 +2750,7 @@ def replaceText(self, text):
         lastcol = 0
         if len(ss) > 0:
             last = ss[-1]
-            if len(last) == len_minus_line_ending(last):
+            if len(last) == utils.len_minus_line_ending(last):
                 del ss[-1]
                 lastcol = len(last)
         cur_line = line0 + len(ss)
@@ -3200,7 +3143,7 @@ def button_press(self, f, x, y, extend):
             x, y = -1, 0
         i = min(y // self.font_height, len(self.panes[f].lines))
         if self.mode == CHAR_MODE and f == self.current_pane:
-            text = strip_eol(self.getLineText(f, i))
+            text = utils.strip_eol(self.getLineText(f, i))
             j = self._getPickedCharacter(text, x, True)
             if extend:
                 si, sj = self.selection_line, self.selection_char
@@ -3241,7 +3184,7 @@ def darea_button_press_cb(self, widget, event, f):
                     self.emit('mode_changed')
                 elif self.mode == CHAR_MODE and self.current_pane == f:
                     # select word
-                    text = strip_eol(self.getLineText(f, i))
+                    text = utils.strip_eol(self.getLineText(f, i))
                     if text is not None:
                         n = len(text)
                         j = self._getPickedCharacter(text, x, False)
@@ -3323,7 +3266,7 @@ def getDiffRanges(self, f, i, idx, flag):
             else:
                 s = s2
             if self.prefs.getBool('display_ignore_endofline'):
-                s = strip_eol(s)
+                s = utils.strip_eol(s)
 
             s1 = nullToEmpty(self.getCompareString(f, i))
             s2 = nullToEmpty(self.getCompareString(f + 1, i))
@@ -3394,7 +3337,7 @@ def getCompareString(self, f, i):
         s = line.getText()
         if s is not None:
             if self.prefs.getBool('display_ignore_endofline'):
-                s = strip_eol(s)
+                s = utils.strip_eol(s)
             if self.prefs.getBool('display_ignore_blanklines') and isBlank(s):
                 return None
             if self.prefs.getBool('display_ignore_whitespace'):
@@ -3906,7 +3849,7 @@ def diffmap_draw_cb(self, widget, cr):
     # returns the maximum valid offset for a cursor position
     # cursors cannot be moved to the right of line ending characters
     def getMaxCharPosition(self, i):
-        return len_minus_line_ending(self.getLineText(self.current_pane, i))
+        return utils.len_minus_line_ending(self.getLineText(self.current_pane, i))
 
     # 'enter_align_mode' keybinding action
     def _line_mode_enter_align_mode(self):
@@ -4132,7 +4075,7 @@ def key_press_cb(self, widget, event):
                     # move the cursor to column 'col' if possible
                     s = self.getLineText(f, i)
                     if s is not None:
-                        s = strip_eol(s)
+                        s = utils.strip_eol(s)
                         idx = 0
                         for c in s:
                             w = self.characterWidth(idx, c)
@@ -4282,7 +4225,7 @@ def key_press_cb(self, widget, event):
                     self.recordEditMode()
                     for i in range(start, end + 1):
                         text = self.getLineText(f, i)
-                        if text is not None and len_minus_line_ending(text) > 0:
+                        if text is not None and utils.len_minus_line_ending(text) > 0:
                             # count spacing before the first non-whitespace character
                             j, w = 0, 0
                             while j < len(text) and text[j] in ' \t':
@@ -4807,7 +4750,7 @@ def remove_trailing_white_space(self):
             text = self.getLineText(f, i)
             if text is not None:
                 # locate trailing whitespace
-                old_n = n = len_minus_line_ending(text)
+                old_n = n = utils.len_minus_line_ending(text)
                 while n > 0 and text[n - 1] in whitespace:
                     n -= 1
                 # update line if it changed
@@ -4914,7 +4857,7 @@ def _adjust_indenting(self, offset):
         self.recordEditMode()
         for i in range(start, end + 1):
             text = self.getLineText(f, i)
-            if text is not None and len_minus_line_ending(text) > 0:
+            if text is not None and utils.len_minus_line_ending(text) > 0:
                 # count spacing before the first non-whitespace character
                 j, w = 0, 0
                 while j < len(text) and text[j] in ' \t':
@@ -5628,8 +5571,8 @@ def load(self, f, info):
                         s, encoding = self.prefs.convertToUnicode(s)
                     else:
                         s = str(s, encoding=encoding)
-                    ss = splitlines(s)
-                except (IOError, OSError, UnicodeDecodeError, WindowsError, LookupError):
+                    ss = utils.splitlines(s)
+                except (IOError, OSError, UnicodeDecodeError, LookupError):
                     # FIXME: this can occur before the toplevel window is drawn
                     if rev is not None:
                         msg = _('Error reading revision %(rev)s of %(file)s.') % { 'rev': rev, 'file': name }
@@ -6460,7 +6403,7 @@ def createCommitFileTabs(self, items, labels, options):
                             name, rev = spec
                             viewer.load(i, FileInfo(name, encoding, vcs, rev))
                         viewer.setOptions(options)
-                except (IOError, OSError, WindowsError):
+                except (IOError, OSError):
                     utils.logErrorAndDialog(_('Error retrieving commits for %s.') % (dn, ), self.get_toplevel())
 
     # create a new viewer for each modified file found in 'items'
@@ -6489,7 +6432,7 @@ def createModifiedFileTabs(self, items, labels, options):
                             name, rev = spec
                             viewer.load(i, FileInfo(name, encoding, vcs, rev))
                         viewer.setOptions(options)
-                except (IOError, OSError, WindowsError):
+                except (IOError, OSError):
                     utils.logErrorAndDialog(_('Error retrieving modifications for %s.') % (dn, ), self.get_toplevel())
 
     # close all tabs without differences

src/utils.py

@@ -96,8 +96,8 @@ def relpath(a, b):
 # helper function prevent files from being confused with command line options
 # by prepending './' to the basename
 def safeRelativePath(abspath1, name, prefs, cygwin_pref):
-    s = os.path.join(os.curdir, utils.relpath(abspath1, os.path.abspath(name)))
-    if utils.isWindows():
+    s = os.path.join(os.curdir, relpath(abspath1, os.path.abspath(name)))
+    if isWindows():
         if prefs.getBool(cygwin_pref):
             s = s.replace('\\', '/')
         else:
@@ -182,6 +182,55 @@ def globEscape(s):
     m = dict([ (c, f'[{c}]') for c in '[]?*' ])
     return ''.join([ m.get(c, c) for c in s ])
 
+# returns the number of characters in the string excluding any line ending
+# characters
+def len_minus_line_ending(s):
+    if s is None:
+        return 0
+    n = len(s)
+    if s.endswith('\r\n'):
+        n -= 2
+    elif s.endswith('\r') or s.endswith('\n'):
+        n -= 1
+    return n
+
+# returns the string without the line ending characters
+def strip_eol(s):
+    if s is not None:
+        return s[:len_minus_line_ending(s)]
+
+# split string into lines based upon DOS, Mac, and Unix line endings
+def splitlines(s):
+    # split on new line characters
+    temp, i, n = [], 0, len(s)
+    while i < n:
+        j = s.find('\n', i)
+        if j < 0:
+            temp.append(s[i:])
+            break
+        j += 1
+        temp.append(s[i:j])
+        i = j
+    # split on carriage return characters
+    ss = []
+    for s in temp:
+        i, n = 0, len(s)
+        while i < n:
+            j = s.find('\r', i)
+            if j < 0:
+                ss.append(s[i:])
+                break
+            j += 1
+            if j < n and s[j] == '\n':
+                j += 1
+            ss.append(s[i:j])
+            i = j
+    return ss
+
+# also recognize old Mac OS line endings
+def readlines(fd):
+    return [ strip_eol(s) for s in splitlines(fd.read()) ]
+
 # use the program's location as a starting place to search for supporting files
 # such as icon and help documentation
 if hasattr(sys, 'frozen'):

src/vcs/cvs.py

@@ -41,11 +41,11 @@ def getCommitTemplate(self, prefs, rev, names):
                 if len(r):
                     prev = '.'.join(r)
             for k in sorted(names):
-                 if prev is None:
-                     k0 = None
-                 else:
-                     k0 = k
-                 result.append([ (k0, prev), (k, rev) ])
+                if prev is None:
+                    k0 = None
+                else:
+                    k0 = k
+                result.append([ (k0, prev), (k, rev) ])
         except ValueError:
             utils.logError(_('Error parsing revision %s.') % (rev, ))
         return result
@@ -73,7 +73,6 @@ def getFolderTemplate(self, prefs, names):
                 if s[0] == 'R':
                     # removed
                     modified[k] = [ (k, prev), (None, None) ]
-                    pass
                 elif s[0] == 'A':
                     # added
                     modified[k] = [ (None, None), (k, None) ]

src/vcs/folder_set.py

@@ -42,4 +42,3 @@ def contains(self, abspath):
             if abspath.startswith(f):
                 return True
         return False
-

src/vcs/git.py

@@ -65,7 +65,14 @@ def _extractPath(self, s, prefs):
 
     def getFolderTemplate(self, prefs, names):
         # build command
-        args = [ prefs.getString('git_bin'), 'status', '--porcelain', '-s', '--untracked-files=no', '--ignore-submodules=all' ]
+        args = [
+            prefs.getString('git_bin'),
+            'status',
+            '--porcelain',
+            '-s',
+            '--untracked-files=no',
+            '--ignore-submodules=all'
+        ]
         # build list of interesting files
         pwd = os.path.abspath(os.curdir)
         isabs = False
@@ -142,14 +149,13 @@ def getFolderTemplate(self, prefs, names):
         return result
 
     def getRevision(self, prefs, name, rev):
+        relpath = utils.relpath(self.root, os.path.abspath(name)).replace(os.sep, '/')
         return utils.popenRead(
             self.root,
             [
                 prefs.getString('git_bin'),
                 'show',
-                '{}:{}'.format(
-                    rev,
-                    utils.relpath(self.root, os.path.abspath(name)).replace(os.sep, '/'))
+                f'{rev}:{relpath}'
             ],
             prefs,
             'git_bash')