From f1bb3c6a9ebe9750f9f71bdb5bbea399d180cc43 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Tue, 7 Aug 2018 06:14:29 -0400 Subject: [PATCH] Pylint and PEP8 cleanup --- mugshot/CameraMugshotDialog.py | 6 +++--- mugshot/MugshotWindow.py | 28 ++++++++++++------------- mugshot_lib/CameraDialog.py | 3 ++- mugshot_lib/SudoDialog.py | 14 ++++++------- mugshot_lib/Window.py | 3 ++- po/mugshot.pot | 38 +++++++++++++++++----------------- setup.py | 13 ++++++------ 7 files changed, 53 insertions(+), 52 deletions(-) diff --git a/mugshot/CameraMugshotDialog.py b/mugshot/CameraMugshotDialog.py index e51fa2f..6a0a1a1 100644 --- a/mugshot/CameraMugshotDialog.py +++ b/mugshot/CameraMugshotDialog.py @@ -29,7 +29,7 @@ gi.require_version('Gst', '1.0') gi.require_version('Cheese', '3.0') gi.require_version('GtkClutter', '1.0') -from gi.repository import Gtk, GObject, Gst, GdkPixbuf # nopep8 +from gi.repository import Gtk, GObject, Gst # nopep8 from gi.repository import Cheese, Clutter, GtkClutter # nopep8 from mugshot_lib import helpers # nopep8 @@ -62,7 +62,7 @@ class CameraBox(GtkClutter.Embed): self.state = Gst.State.PLAYING def added(signal, data): - if ("get_device_node" in dir(data)): + if "get_device_node" in dir(data): node = data.get_device_node() self.camera.set_device_by_device_node(node) else: @@ -189,7 +189,7 @@ class CameraMugshotDialog(CameraDialog): __gsignals__ = {'apply': (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, (GObject.TYPE_STRING,)) - } + } def finish_initializing(self, builder): # pylint: disable=E1002 """Set up the camera dialog""" diff --git a/mugshot/MugshotWindow.py b/mugshot/MugshotWindow.py index f21aed3..252508b 100644 --- a/mugshot/MugshotWindow.py +++ b/mugshot/MugshotWindow.py @@ -18,18 +18,16 @@ from locale import gettext as _ -import os -# Used for automating chfn -import pexpect -# Used for copying files to ~/.face -import shutil -# Used for which command and checking for running processes. -import subprocess -# DBUS interface is used to update pidgin buddyicon when pidgin is running. -import dbus - -from gi.repository import Gtk, GdkPixbuf, GLib, Gio # pylint: disable=E0611 import logging +import os +import shutil +import subprocess + +import dbus +import pexpect + +from gi.repository import Gtk, GdkPixbuf, GLib # pylint: disable=E0611 + from mugshot_lib import Window, SudoDialog, AccountsServiceAdapter, helpers @@ -509,6 +507,7 @@ class MugshotWindow(Window): return True if self.email != self.email_entry.get_text().strip(): return True + return False def save_as_details(self): if not self.accounts_service.available(): @@ -538,9 +537,8 @@ class MugshotWindow(Window): if modified: logger.debug('chfn details have been modified.') return True - else: - logger.debug('chfn details have NOT been modified.') - return False + logger.debug('chfn details have NOT been modified.') + return False def process_terminal_password(self, command, password): """Handle password prompts from the interactive chfn commands.""" @@ -623,7 +621,7 @@ class MugshotWindow(Window): w_command = "%s -w \"%s\" %s" % (chfn, office_phone, username) if self.process_terminal_password(p_command, password) or \ - self.process_terminal_password(w_command, password): + self.process_terminal_password(w_command, password): self.office_phone = office_phone else: success = False diff --git a/mugshot_lib/CameraDialog.py b/mugshot_lib/CameraDialog.py index 6e425d0..e173336 100644 --- a/mugshot_lib/CameraDialog.py +++ b/mugshot_lib/CameraDialog.py @@ -16,9 +16,10 @@ # You should have received a copy of the GNU General Public License along # with this program. If not, see . -from gi.repository import Gtk # pylint: disable=E0611 import logging +from gi.repository import Gtk # pylint: disable=E0611 + from . helpers import get_builder logger = logging.getLogger('mugshot_lib') diff --git a/mugshot_lib/SudoDialog.py b/mugshot_lib/SudoDialog.py index c663634..b410a50 100644 --- a/mugshot_lib/SudoDialog.py +++ b/mugshot_lib/SudoDialog.py @@ -16,11 +16,11 @@ # You should have received a copy of the GNU General Public License along # with this program. If not, see . -from gi.repository import Gtk, GdkPixbuf import os - from locale import gettext as _ +from gi.repository import Gtk, GdkPixbuf + import pexpect gtk_version = (Gtk.get_major_version(), @@ -32,6 +32,7 @@ def check_gtk_version(major_version, minor_version, micro=0): """Return true if running gtk >= requested version""" return gtk_version >= (major_version, minor_version, micro) + # Check if the LANG variable needs to be set use_env = False @@ -52,8 +53,8 @@ def check_dependencies(commands=[]): try: child = env_spawn('sudo', ['-v'], 1) if child.expect([".*ssword.*", "Sorry", - pexpect.EOF, - pexpect.TIMEOUT]) == 3: + pexpect.EOF, + pexpect.TIMEOUT]) == 3: global use_env use_env = True child.close() @@ -325,6 +326,5 @@ class SudoDialog(Gtk.Dialog): if child.exitstatus == 0: self.attempted_logins = 0 return True - else: - self.attempted_logins += 1 - return False + self.attempted_logins += 1 + return False diff --git a/mugshot_lib/Window.py b/mugshot_lib/Window.py index b21260d..1f2e4b9 100644 --- a/mugshot_lib/Window.py +++ b/mugshot_lib/Window.py @@ -83,7 +83,8 @@ class Window(Gtk.Window): elif self.CameraDialog is not None: logger.debug('create new camera_dialog') self.camera_dialog = self.CameraDialog() # pylint: disable=E1102 - self.camera_dialog.connect('apply', self.on_camera_dialog_apply) # pylint: disable=E1101 + self.camera_dialog.connect( + 'apply', self.on_camera_dialog_apply) # pylint: disable=E1101 self.camera_dialog.show() def on_destroy(self, widget, data=None): diff --git a/po/mugshot.pot b/po/mugshot.pot index 9db7999..fd3ddb0 100644 --- a/po/mugshot.pot +++ b/po/mugshot.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-06 18:22-0400\n" +"POT-Creation-Date: 2018-08-07 06:13-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -61,7 +61,7 @@ msgstr "" msgid "Browse…" msgstr "" -#: ../data/ui/MugshotWindow.ui.h:9 ../mugshot/MugshotWindow.py:569 +#: ../data/ui/MugshotWindow.ui.h:9 ../mugshot/MugshotWindow.py:567 msgid "Mugshot" msgstr "" @@ -107,76 +107,76 @@ msgstr "" msgid "Retry" msgstr "" -#: ../mugshot/MugshotWindow.py:346 +#: ../mugshot/MugshotWindow.py:344 msgid "Authentication cancelled." msgstr "" -#: ../mugshot/MugshotWindow.py:349 +#: ../mugshot/MugshotWindow.py:347 msgid "Authentication failed." msgstr "" -#: ../mugshot/MugshotWindow.py:352 +#: ../mugshot/MugshotWindow.py:350 msgid "An error occurred when saving changes." msgstr "" -#: ../mugshot/MugshotWindow.py:354 +#: ../mugshot/MugshotWindow.py:352 msgid "User details were not updated." msgstr "" -#: ../mugshot/MugshotWindow.py:456 +#: ../mugshot/MugshotWindow.py:454 msgid "Update Pidgin buddy icon?" msgstr "" -#: ../mugshot/MugshotWindow.py:457 +#: ../mugshot/MugshotWindow.py:455 msgid "Would you also like to update your Pidgin buddy icon?" msgstr "" -#: ../mugshot/MugshotWindow.py:570 +#: ../mugshot/MugshotWindow.py:568 msgid "Enter your password to change user details." msgstr "" -#: ../mugshot/MugshotWindow.py:572 +#: ../mugshot/MugshotWindow.py:570 msgid "" "This is a security measure to prevent unwanted updates\n" "to your personal information." msgstr "" -#: ../mugshot/MugshotWindow.py:839 +#: ../mugshot/MugshotWindow.py:837 msgid "Update LibreOffice user details?" msgstr "" -#: ../mugshot/MugshotWindow.py:840 +#: ../mugshot/MugshotWindow.py:838 msgid "Would you also like to update your user details in LibreOffice?" msgstr "" -#: ../mugshot_lib/SudoDialog.py:130 +#: ../mugshot_lib/SudoDialog.py:131 msgid "Password Required" msgstr "" -#: ../mugshot_lib/SudoDialog.py:167 +#: ../mugshot_lib/SudoDialog.py:168 msgid "Incorrect password... try again." msgstr "" -#: ../mugshot_lib/SudoDialog.py:177 +#: ../mugshot_lib/SudoDialog.py:178 msgid "Password:" msgstr "" #. Buttons -#: ../mugshot_lib/SudoDialog.py:188 +#: ../mugshot_lib/SudoDialog.py:189 msgid "Cancel" msgstr "" -#: ../mugshot_lib/SudoDialog.py:191 +#: ../mugshot_lib/SudoDialog.py:192 msgid "OK" msgstr "" -#: ../mugshot_lib/SudoDialog.py:212 +#: ../mugshot_lib/SudoDialog.py:213 msgid "" "Enter your password to\n" "perform administrative tasks." msgstr "" -#: ../mugshot_lib/SudoDialog.py:214 +#: ../mugshot_lib/SudoDialog.py:215 #, python-format msgid "" "The application '%s' lets you\n" diff --git a/setup.py b/setup.py index 38025c0..504f5c2 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ def update_config(libdir, values={}): return oldvalues -def move_icon_file(root, target_data, prefix): +def move_icon_file(root, target_data): """Move the icon files to their installation prefix.""" old_icon_path = os.path.normpath(os.path.join(root, target_data, 'share', 'mugshot', 'media')) @@ -67,7 +67,7 @@ def move_icon_file(root, target_data, prefix): 'mugshot_%s.svg' % icon_size.split('x')[0]) icon_path = os.path.normpath(os.path.join(root, target_data, 'share', - 'icons', 'hicolor', icon_size, 'apps')) + 'icons', 'hicolor', icon_size, 'apps')) icon_file = os.path.join(icon_path, 'mugshot.svg') old_icon_file = os.path.realpath(old_icon_file) icon_file = os.path.realpath(icon_file) @@ -89,7 +89,7 @@ def move_icon_file(root, target_data, prefix): return icon_file -def get_desktop_file(root, target_data, prefix): +def get_desktop_file(root, target_data): """Move the desktop file to its installation prefix.""" desktop_path = os.path.realpath(os.path.join(root, target_data, 'share', 'applications')) @@ -140,7 +140,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): DistUtilsExtra.auto.install_auto.run(self) print(("=== Installing %s, version %s ===" % - (self.distribution.get_name(), self.distribution.get_version()))) + (self.distribution.get_name(), self.distribution.get_version()))) if not self.prefix: self.prefix = '' @@ -180,11 +180,12 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): '__version__': "'%s'" % self.distribution.get_version()} update_config(self.install_lib, values) - desktop_file = get_desktop_file(self.root, target_data, self.prefix) + desktop_file = get_desktop_file(self.root, target_data) print(("Desktop File: %s\n" % desktop_file)) - move_icon_file(self.root, target_data, self.prefix) + move_icon_file(self.root, target_data) update_desktop_file(desktop_file, script_path) + DistUtilsExtra.auto.setup( name='mugshot', version='0.4.0',