Fix numerous warnings from flake8.

src/fluxgui/exceptions.py

@@ -1,17 +1,22 @@
 __all__ = ['DirectoryCreationError', 'FileNotFoundError',
-        'XfluxError', 'MethodUnavailableError']
+           'XfluxError', 'MethodUnavailableError']
+
 
 class Error(Exception):
     pass
 
+
 class DirectoryCreationError(Error):
     pass
 
+
 class FileNotFoundError(Error):
     pass
 
+
 class XfluxError(Error):
     pass
 
+
 class MethodUnavailableError(Error):
     pass

src/fluxgui/fluxapp.py

@@ -1,15 +1,15 @@
 #!/usr/bin/env python3
 
-from fluxgui.exceptions import MethodUnavailableError
-from fluxgui import fluxcontroller, settings
-import gi
-gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk as gtk
-gi.require_version('AppIndicator3', '0.1')
 from gi.repository import AppIndicator3 as appindicator
 import signal
 import os
 import sys
+from fluxgui.exceptions import MethodUnavailableError
+from fluxgui import fluxcontroller, settings
+import gi
+gi.require_version('Gtk', '3.0')
+gi.require_version('AppIndicator3', '0.1')
 
 
 class FluxGUI(object):
@@ -22,7 +22,7 @@ def __init__(self):
             self.xflux_controller = fluxcontroller.FluxController(self.settings)
             self.indicator = Indicator(self, self.xflux_controller)
             self.preferences = Preferences(self.settings,
-                    self.xflux_controller)
+                                           self.xflux_controller)
             self.xflux_controller.start()
 
         except Exception as e:
@@ -52,6 +52,7 @@ def exit(self, code=0):
     def run(self):
         gtk.main()
 
+
 class Indicator(object):
     """
     Information and methods related to the indicator applet.
@@ -77,15 +78,15 @@ def create_menu(self):
         menu = gtk.Menu()
 
         self.add_menu_item("Pause f.lux", self._toggle_pause,
-                menu, MenuItem=gtk.CheckMenuItem)
+                           menu, MenuItem=gtk.CheckMenuItem)
         self.add_menu_item("Preferences", self._open_preferences, menu)
         self.add_menu_separator(menu)
         self.add_menu_item("Quit", self._quit, menu)
 
         return menu
 
     def add_menu_item(self, label, handler, menu,
-            event="activate", MenuItem=gtk.MenuItem, show=True):
+                      event="activate", MenuItem=gtk.MenuItem, show=True):
         item = MenuItem(label)
         item.connect(event, handler)
         menu.append(item)
@@ -103,11 +104,12 @@ def _toggle_pause(self, item):
         self.xflux_controller.toggle_pause()
 
     def _open_preferences(self, item):
-            self.fluxgui.open_preferences()
+        self.fluxgui.open_preferences()
 
     def _quit(self, item):
         self.fluxgui.exit()
 
+
 class Preferences(object):
     """
     Information and methods related to the preferences window.
@@ -116,34 +118,34 @@ class Preferences(object):
     """
 
     def connect_widget(self, widget_name, connect_target=None,
-            connect_event="activate"):
+                       connect_event="activate"):
         widget = self.wTree.get_object(widget_name)
         if connect_target:
             widget.connect(connect_event, connect_target)
         return widget
 
-
     def __init__(self, settings, xflux_controller):
         self.settings = settings
         self.xflux_controller = xflux_controller
 
         self.gladefile = os.path.join(os.path.dirname(os.path.dirname(
-          os.path.realpath(__file__))), "fluxgui/preferences.glade")
+            os.path.realpath(__file__))), "fluxgui/preferences.glade")
         self.wTree = gtk.Builder.new_from_file(self.gladefile)
 
         self.window = self.connect_widget("window1", self.delete_event,
-                connect_event="delete-event")
+                                          connect_event="delete-event")
         self.latsetting = self.connect_widget("entryLatitude",
-                self.delete_event)
+                                              self.delete_event)
         self.lonsetting = self.connect_widget("entryLongitude",
-                self.delete_event)
+                                              self.delete_event)
         self.zipsetting = self.connect_widget("entryZipcode",
-                self.delete_event)
+                                              self.delete_event)
         self.colsetting = self.connect_widget("comboColor")
         self.previewbutton = self.connect_widget("buttonPreview",
-                self.preview_click_event, "clicked")
+                                                 self.preview_click_event,
+                                                 "clicked")
         self.closebutton = self.connect_widget("buttonClose",
-                self.delete_event, "clicked")
+                                               self.delete_event, "clicked")
         self.autostart = self.connect_widget("checkAutostart")
 
         if (self.settings.latitude == "" and self.settings.zipcode == "")\
@@ -184,18 +186,18 @@ def preview_click_event(self, widget, data=None):
     def delete_event(self, widget, data=None):
         if self.settings.latitude != self.latsetting.get_text():
             self.xflux_controller.set_xflux_latitude(
-                    self.latsetting.get_text())
+                self.latsetting.get_text())
 
         if self.settings.longitude != self.lonsetting.get_text():
             self.xflux_controller.set_xflux_longitude(
-                    self.lonsetting.get_text())
+                self.lonsetting.get_text())
 
         if self.settings.zipcode != self.zipsetting.get_text():
             self.xflux_controller.set_xflux_zipcode(
-                    self.zipsetting.get_text())
+                self.zipsetting.get_text())
 
         colsetting_temperature = settings.key_to_temperature(
-                self.colsetting.get_active())
+            self.colsetting.get_active())
         if self.settings.color != colsetting_temperature:
             self.xflux_controller.color = colsetting_temperature
 
@@ -211,6 +213,7 @@ def delete_event(self, widget, data=None):
         self.window.hide()
         return True
 
+
 def main():
     try:
         app = FluxGUI()
@@ -222,5 +225,6 @@ def main():
         # after killing fluxgui with SIGINT or SIGTERM ...
         pass
 
+
 if __name__ == '__main__':
     main()

src/fluxgui/fluxcontroller.py

@@ -1,5 +1,6 @@
 from fluxgui import xfluxcontroller
 
+
 class FluxController(xfluxcontroller.XfluxController):
     """
     FluxController is the same as XfluxController except that it
@@ -9,7 +10,7 @@ class FluxController(xfluxcontroller.XfluxController):
     def __init__(self, settings):
         self.settings = settings
         super(FluxController, self).__init__(
-                **self.settings.xflux_settings_dict())
+            **self.settings.xflux_settings_dict())
 
     def start(self):
         if self.settings.zipcode == "" and self.settings.latitude == "":
@@ -40,6 +41,4 @@ def _set_xflux_color(self, col):
     def _get_xflux_color(self):
         return super(FluxController, self)._get_xflux_color()
 
-    color=property(_get_xflux_color, _set_xflux_color)
-
-
+    color = property(_get_xflux_color, _set_xflux_color)

src/fluxgui/settings.py

@@ -13,10 +13,10 @@
 default_temperature = '3400'
 off_temperature = '6500'
 temperatures = [
-    '2000', # The minimum supported by flux; see https://github.com/xflux-gui/xflux-gui/issues/51
+    '2000',  # The minimum supported by flux; see https://github.com/xflux-gui/xflux-gui/issues/51
     '2300',
     '2700',
-    '3400', # The 'default_temperature' needs to be one of the options!
+    '3400',  # The 'default_temperature' needs to be one of the options!
     '4200',
     '5000',
     # The "off temperature" is not one of the menu choices, but
@@ -25,7 +25,8 @@
     #
     # TODO(ntc2): understand why this entry is in the list, and remove
     # it if possible.
-    off_temperature ]
+    off_temperature]
+
 
 def key_to_temperature(key):
     """The inverse of 'temperature_to_key'.
@@ -41,6 +42,7 @@ def key_to_temperature(key):
     except IndexError:
         return off_temperature
 
+
 def temperature_to_key(temperature):
     """Convert a temperature like "3400" to a Glade/GTK menu value like
     "1" or "off".
@@ -57,6 +59,7 @@ def temperature_to_key(temperature):
 
 ################################################################
 
+
 class Settings(object):
 
     def __init__(self):
@@ -93,11 +96,11 @@ def __init__(self):
 
     def xflux_settings_dict(self):
         d = {
-                'color': self.color,
-                'latitude': self.latitude,
-                'longitude': self.longitude,
-                'zipcode': self.zipcode,
-                'pause_color': off_temperature
+            'color': self.color,
+            'latitude': self.latitude,
+            'longitude': self.longitude,
+            'zipcode': self.zipcode,
+            'pause_color': off_temperature
         }
         return d
 
@@ -140,14 +143,14 @@ def _set_autostart(self, value):
         else:
             self._delete_autostarter()
 
-    color=property(_get_color, _set_color)
-    latitude=property(_get_latitude, _set_latitude)
-    longitude=property(_get_longitude, _set_longitude)
-    zipcode=property(_get_zipcode, _set_zipcode)
-    autostart=property(_get_autostart, _set_autostart)
+    color = property(_get_color, _set_color)
+    latitude = property(_get_latitude, _set_latitude)
+    longitude = property(_get_longitude, _set_longitude)
+    zipcode = property(_get_zipcode, _set_zipcode)
+    autostart = property(_get_autostart, _set_autostart)
 
+    # autostart code copied from AWN
 
-    #autostart code copied from AWN
     def _get_autostart_file_path(self):
         autostart_dir = os.path.join(os.environ['HOME'], '.config',
                                      'autostart')
@@ -158,7 +161,7 @@ def _create_autostarter(self):
         autostart_dir = os.path.dirname(autostart_file)
 
         if not os.path.isdir(autostart_dir):
-            #create autostart dir
+            # create autostart dir
             try:
                 os.mkdir(autostart_dir)
             except DirectoryCreationError as e: