From 65b00fb57bb1b55abf3a7010b5829e6f18ead08b Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Mon, 6 Aug 2018 05:47:21 -0400 Subject: [PATCH] Tidy pylint errors and warnings --- mugshot/CameraMugshotDialog.py | 4 ++-- mugshot/MugshotWindow.py | 12 +++++++----- mugshot/__init__.py | 2 +- mugshot_lib/AccountsServiceAdapter.py | 1 - mugshot_lib/Builder.py | 2 +- mugshot_lib/Window.py | 4 +++- po/mugshot.pot | 6 +++--- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/mugshot/CameraMugshotDialog.py b/mugshot/CameraMugshotDialog.py index 12795dc..a604e28 100644 --- a/mugshot/CameraMugshotDialog.py +++ b/mugshot/CameraMugshotDialog.py @@ -95,8 +95,8 @@ class CameraBox(GtkClutter.Embed): viewport_layout_manager = Clutter.BinLayout() background_layer = Clutter.Actor.new() - status, background_layer.props.background_color = \ - Clutter.Color.from_string("Black") + background_layer.props.background_color = \ + Clutter.Color.from_string("Black")[0] background_layer.props.x = 0 background_layer.props.y = 0 background_layer.props.width = 100 diff --git a/mugshot/MugshotWindow.py b/mugshot/MugshotWindow.py index 1b26129..c77367e 100644 --- a/mugshot/MugshotWindow.py +++ b/mugshot/MugshotWindow.py @@ -101,7 +101,7 @@ def has_gstreamer_camerasrc_support(): def has_camera_libraries(): """Return True if it is possible to display the camera dialog.""" try: - from gi.repository import Cheese, Clutter, GtkClutter + from gi.repository import Cheese, Clutter, GtkClutter # pylint: disable=W0612 except: return False return True @@ -304,7 +304,7 @@ class MugshotWindow(Window): self.menuitem1.set_visible(True) self.image_remove.set_visible(True) return - except GLib.Error: + except GLib.Error: # pylint: disable=E0712 pass self.user_image.set_from_icon_name('avatar-default', 128) @@ -719,6 +719,7 @@ class MugshotWindow(Window): data = {'first_name': name['first'], 'last_name': name['last'], 'home_phone': '', 'office_phone': '', 'initials': name['initials'], 'email': '', 'fax': ''} + return data def get_passwd_data(self): """Get user details from passwd""" @@ -735,14 +736,15 @@ class MugshotWindow(Window): details.append("") # Extract the user details - name, office, office_phone, home_phone = details[:4] + name = details[0] + office_phone = details[2] + home_phone = details[3] except subprocess.CalledProcessError: logger.warning("User %s not found in /etc/passwd. " "Mugshot may not function correctly." % username) - office = "" + name = "" office_phone = "" home_phone = "" - name = "" name = self.split_name(name) diff --git a/mugshot/__init__.py b/mugshot/__init__.py index bf7fb4b..5a5691e 100644 --- a/mugshot/__init__.py +++ b/mugshot/__init__.py @@ -34,7 +34,7 @@ def parse_options(): parser.add_option( "-v", "--verbose", action="count", dest="verbose", help=_("Show debug messages (-vv debugs mugshot_lib also)")) - (options, args) = parser.parse_args() + options = parser.parse_args()[0] set_up_logging(options) diff --git a/mugshot_lib/AccountsServiceAdapter.py b/mugshot_lib/AccountsServiceAdapter.py index d699a49..56b08fb 100644 --- a/mugshot_lib/AccountsServiceAdapter.py +++ b/mugshot_lib/AccountsServiceAdapter.py @@ -83,7 +83,6 @@ class MugshotAccountsServiceAdapter: try: bus = self._get_bus() - path = self._find_user_by_name(self._username) bus.call_sync('org.freedesktop.Accounts', self._get_path(), diff --git a/mugshot_lib/Builder.py b/mugshot_lib/Builder.py index 3d8ac78..02987fe 100644 --- a/mugshot_lib/Builder.py +++ b/mugshot_lib/Builder.py @@ -26,7 +26,7 @@ from xml.etree.cElementTree import ElementTree import gi gi.require_version('Gtk', '3.0') -from gi.repository import GObject, Gtk # pylint: disable=E0611 # nopep8 +from gi.repository import GObject, Gtk logger = logging.getLogger('mugshot_lib') diff --git a/mugshot_lib/Window.py b/mugshot_lib/Window.py index dba8398..b21260d 100644 --- a/mugshot_lib/Window.py +++ b/mugshot_lib/Window.py @@ -69,6 +69,8 @@ class Window(Gtk.Window): self.settings = Gio.Settings.new("apps.mugshot") self.settings.connect('changed', self.on_preferences_changed) + self.tmpfile = None + def on_help_activate(self, widget, data=None): """Show the Help documentation when Help is clicked.""" show_uri(self, "https://wiki.bluesabre.org/doku.php?id=mugshot-docs") @@ -81,7 +83,7 @@ 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) + 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 cce1783..5f5fd14 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 05:17-0400\n" +"POT-Creation-Date: 2018-08-06 05:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -141,11 +141,11 @@ msgid "" "to your personal information." msgstr "" -#: ../mugshot/MugshotWindow.py:820 +#: ../mugshot/MugshotWindow.py:822 msgid "Update LibreOffice user details?" msgstr "" -#: ../mugshot/MugshotWindow.py:821 +#: ../mugshot/MugshotWindow.py:823 msgid "Would you also like to update your user details in LibreOffice?" msgstr ""