Merge pull request #121 from MightyCreak/pylint

More lint errors fixed

Author: MightyCreak

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Pylint
       uses: cclauss/GitHub-Action-for-pylint@master
       with:
-        args: "pylint src/vcs/ src/dialogs.py src/preferences.py src/resources.py src/utils.py src/widgets.py"
+        args: "apk add --no-cache gtk+3.0-dev gobject-introspection-dev ; pip install -r requirements.txt ; pylint src/**/*.py"
 
   meson-build-test:
     runs-on: ubuntu-latest

.pylintrc

@@ -24,7 +24,7 @@ ignore=CVS
 
 # Add files or directories matching the regex patterns to the ignore-list. The
 # regex matches against paths.
-ignore-paths=
+ignore-paths=src/diffuse/main.py
 
 # Files or directories matching the regex patterns are skipped. The regex
 # matches against base names, not paths.
@@ -90,12 +90,10 @@ disable=raw-checker-failed,
         # temporary silenced messages (ordered alphabetically)
         duplicate-code,
         fixme,
-        import-error,
         invalid-name,
         missing-class-docstring,
         missing-function-docstring,
         missing-module-docstring,
-        no-self-use,
         too-few-public-methods,
         too-many-arguments,
         too-many-branches,

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The new widgets.py is a bit fat though (~4000 lines)
 
 ### Fixed
+- The intense code cleaning seems to have fixed a bug with the `-c` argument
+  (#120)
 
 ## [0.7.2] - 2021-11-18
 

requirements.txt

@@ -0,0 +1,2 @@
+PyGObject~=3.40
+pylint~=2.11

src/__init__.py src/diffuse/__init__.pysrc/__init__.py renamed to src/diffuse/__init__.py

@@ -26,7 +26,9 @@
 from gi.repository import GObject, Gtk
 # pylint: enable=wrong-import-position
 
+# pylint: disable-next=no-name-in-module
 from diffuse import constants
+
 from diffuse import utils
 
 # the about dialog
@@ -67,7 +69,8 @@ class FileChooserDialog(Gtk.FileChooserDialog):
     # location for empty panes
     last_chosen_folder = os.path.realpath(os.curdir)
 
-    def __current_folder_changed_cb(self, widget):
+    @staticmethod
+    def _current_folder_changed_cb(widget):
         FileChooserDialog.last_chosen_folder = widget.get_current_folder()
 
     def __init__(self, title, parent, prefs, action, accept, rev=False):
@@ -96,7 +99,7 @@ def __init__(self, title, parent, prefs, action, accept, rev=False):
         self.vbox.pack_start(hbox, False, False, 0) # pylint: disable=no-member
         hbox.show()
         self.set_current_folder(self.last_chosen_folder)
-        self.connect('current-folder-changed', self.__current_folder_changed_cb)
+        self.connect('current-folder-changed', self._current_folder_changed_cb)
 
     def set_encoding(self, encoding):
         self.encoding.set_text(encoding)
@@ -107,6 +110,7 @@ def get_encoding(self):
     def get_revision(self):
         return self.revision.get_text()
 
+    # pylint: disable-next=arguments-differ
     def get_filename(self):
         # convert from UTF-8 string to unicode
         return Gtk.FileChooserDialog.get_filename(self) # pylint: disable=no-member

src/constants.py.in src/diffuse/constants.py.insrc/constants.py.in renamed to src/diffuse/constants.py.in

@@ -20,11 +20,9 @@
 import os
 import sys
 import codecs
-import difflib
 import encodings
 import shlex
 import stat
-import unicodedata
 import webbrowser
 
 # pylint: disable=wrong-import-position
@@ -40,14 +38,16 @@
 
 from urllib.parse import urlparse
 
+# pylint: disable-next=no-name-in-module
 from diffuse import constants
+
 from diffuse import utils
 from diffuse.dialogs import AboutDialog, FileChooserDialog, NumericDialog, SearchDialog
 from diffuse.preferences import Preferences
-from diffuse.resources import Resources, theResources
+from diffuse.resources import theResources
 from diffuse.vcs.vcs_registry import VcsRegistry
-from diffuse.widgets import FileDiffViewer, ScrolledWindow
-from diffuse.widgets import LINE_MODE, CHAR_MODE, ALIGN_MODE
+from diffuse.widgets import FileDiffViewer
+from diffuse.widgets import createMenu, LINE_MODE, CHAR_MODE, ALIGN_MODE
 
 theVCSs = VcsRegistry()
 
@@ -933,11 +933,11 @@ def saveState(self, statepath):
             utils.logDebug(f'Error writing {statepath}.')
 
     # select viewer for a newly selected file in the confirm close dialogue
-    def __confirmClose_row_activated_cb(self, tree, path, col, model):
+    def _confirmClose_row_activated_cb(self, tree, path, col, model):
         self.notebook.set_current_page(self.notebook.page_num(model[path][3]))
 
     # toggle save state for a file listed in the confirm close dialogue
-    def __confirmClose_toggle_cb(self, cell, path, model):
+    def _confirmClose_toggle_cb(self, cell, path, model):
         model[path][0] = not model[path][0]
 
     # returns True if the list of viewers can be closed.  The user will be
@@ -970,7 +970,7 @@ def confirmCloseViewers(self, viewers):
         sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
         treeview = Gtk.TreeView.new_with_model(model)
         r = Gtk.CellRendererToggle.new()
-        r.connect('toggled', self.__confirmClose_toggle_cb, model)
+        r.connect('toggled', self._confirmClose_toggle_cb, model)
         column = Gtk.TreeViewColumn(None, r)
         column.add_attribute(r, 'active', 0)
         treeview.append_column(column)
@@ -984,7 +984,7 @@ def confirmCloseViewers(self, viewers):
         column.set_resizable(True)
         column.set_sort_column_id(2)
         treeview.append_column(column)
-        treeview.connect('row-activated', self.__confirmClose_row_activated_cb, model)
+        treeview.connect('row-activated', self._confirmClose_row_activated_cb, model)
         sw.add(treeview)
         treeview.show()
         dialog.vbox.pack_start(sw, True, True, 0) # pylint: disable=no-member
@@ -1190,7 +1190,7 @@ def createCommitFileTabs(self, items, labels, options):
         new_items = []
         for item in items:
             name, data = item
-            # get full path to an existing ancessor directory
+            # get full path to an existing ancestor directory
             dn = os.path.abspath(name)
             while not os.path.isdir(dn):
                 dn, old_dn = os.path.dirname(dn), dn
@@ -1552,7 +1552,7 @@ def _create_menu_bar(specs, radio, accel_group):
     menu_bar = Gtk.MenuBar.new()
     for label, spec in specs:
         menu = Gtk.MenuItem.new_with_mnemonic(label)
-        menu.set_submenu(utils.createMenu(spec, radio, accel_group))
+        menu.set_submenu(createMenu(spec, radio, accel_group))
         menu.set_use_underline(True)
         menu.show()
         menu_bar.append(menu)

src/dialogs.py src/diffuse/dialogs.pysrc/dialogs.py renamed to src/diffuse/dialogs.py

@@ -0,0 +1,46 @@
+pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
+moduledir = join_paths(pkgdatadir, 'diffuse')
+sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
+
+python = import('python')
+
+conf = configuration_data()
+conf.set('PYTHON', python.find_installation('python3').path())
+conf.set('pkgdatadir', pkgdatadir)
+conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
+
+configure_file(
+  input: 'diffuse.in',
+  output: 'diffuse',
+  configuration: conf,
+  install: true,
+  install_dir: get_option('bindir')
+)
+
+conf = configuration_data()
+conf.set('VERSION', meson.project_version())
+conf.set('sysconfigdir', sysconfdir)
+conf.set('log_print_output', get_option('log_print_output'))
+conf.set('log_print_stack', get_option('log_print_stack'))
+conf.set('use_flatpak', get_option('use_flatpak'))
+
+configure_file(
+  input: 'constants.py.in',
+  output: 'constants.py',
+  configuration: conf,
+  install: true,
+  install_dir: moduledir
+)
+
+diffuse_sources = [
+  '__init__.py',
+  'dialogs.py',
+  'main.py',
+  'preferences.py',
+  'resources.py',
+  'utils.py',
+  'widgets.py',
+]
+
+install_data(diffuse_sources, install_dir: moduledir)
+install_subdir('vcs', install_dir: moduledir, strip_directory: false)