voctogui: pep8ify

* Indent by 4 spaces
* Use spaces around infix operators
* Reformat some argument lists
* One import per line
* Start line comments with '# '
* Two newlines before free functions
* One newline before methods

1 files changed, 122 insertions, 104 deletions

diff --git a/voctogui/voctogui.py b/voctogui/voctogui.py
index 9ae3af5..0e953b5 100755
--- a/voctogui/voctogui.py
+++ b/voctogui/voctogui.py
@@ -1,5 +1,9 @@
 #!/usr/bin/env python3
-import gi, signal, logging, sys, os
+import gi
+import signal
+import logging
+import sys
+import os
 
 # import GStreamer and GLib-Helper classes
 gi.require_version('Gtk', '3.0')
@@ -15,11 +19,12 @@ minPy = (3, 0)
 
 Gst.init([])
 if Gst.version() < minGst:
-	raise Exception("GStreamer version", Gst.version(), 'is too old, at least', minGst, 'is required')
+    raise Exception('GStreamer version', Gst.version(),
+                    'is too old, at least', minGst, 'is required')
 
 if sys.version_info < minPy:
-	raise Exception("Python version", sys.version_info, 'is too old, at least', minPy, 'is required')
-
+    raise Exception('Python version', sys.version_info,
+                    'is too old, at least', minPy, 'is required')
 
 # init GObject & Co. before importing local classes
 GObject.threads_init()
@@ -35,112 +40,125 @@ from lib.loghandler import LogHandler
 import lib.connection as Connection
 import lib.clock as ClockManager
 
+
 # main class
 class Voctogui(object):
-	def __init__(self):
-		self.log = logging.getLogger('Voctogui')
-
-		# Uf a UI-File was specified on the Command-Line, load it
-		if Args.ui_file:
-			self.log.info('loading ui-file from file specified on command-line: %s', self.options.ui_file)
-			self.ui = Ui(Args.ui_file)
-
-		else:
-			# Paths to look for the gst-switch UI-File
-			paths = [
-				os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ui/voctogui.ui'),
-				'/usr/lib/voctogui/ui/voctogui.ui'
-			]
-
-			# Look for a gst-switch UI-File and load it
-			for path in paths:
-				self.log.debug('trying to load ui-file from file %s', path)
-
-				if os.path.isfile(path):
-					self.log.info('loading ui-file from file %s', path)
-					self.ui = Ui(path)
-					break
-
-		if self.ui is None:
-			raise Exception("Can't find any .ui-Files to use (searched %s)" % (', '.join(paths)))
-
-		self.ui.setup()
-
-
-	def run(self):
-		self.log.info('setting UI visible')
-		self.ui.show()
-
-		try:
-			self.log.info('running Gtk-MainLoop')
-			Gtk.main()
-			self.log.info('Gtk-MainLoop ended')
-		except KeyboardInterrupt:
-			self.log.info('Terminated via Ctrl-C')
 
-	def quit(self):
-		self.log.info('quitting Gtk-MainLoop')
-		Gtk.main_quit()
+    def __init__(self):
+        self.log = logging.getLogger('Voctogui')
+
+        # Uf a UI-File was specified on the Command-Line, load it
+        if Args.ui_file:
+            self.log.info(
+                'loading ui-file from file specified on command-line: %s',
+                Args.ui_file
+            )
+            self.ui = Ui(Args.ui_file)
+        else:
+            # Paths to look for the gst-switch UI-File
+            paths = [
+                os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                             'ui/voctogui.ui'),
+                '/usr/lib/voctogui/ui/voctogui.ui'
+            ]
+
+            # Look for a gst-switch UI-File and load it
+            self.ui = None
+            for path in paths:
+                self.log.debug('trying to load ui-file from file %s', path)
+
+                if os.path.isfile(path):
+                    self.log.info('loading ui-file from file %s', path)
+                    self.ui = Ui(path)
+                    break
+
+        if self.ui is None:
+            raise Exception("Can't find any .ui-Files to use "
+                            "(searched {})".format(', '.join(paths)))
+
+        self.ui.setup()
+
+    def run(self):
+        self.log.info('setting UI visible')
+        self.ui.show()
+
+        try:
+            self.log.info('running Gtk-MainLoop')
+            Gtk.main()
+            self.log.info('Gtk-MainLoop ended')
+        except KeyboardInterrupt:
+            self.log.info('Terminated via Ctrl-C')
+
+    def quit(self):
+        self.log.info('quitting Gtk-MainLoop')
+        Gtk.main_quit()
 
 
 # run mainclass
 def main():
-	# configure logging
-	docolor = (Args.color == 'always') or (Args.color == 'auto' and sys.stderr.isatty())
-
-	handler = LogHandler(docolor, Args.timestamp)
-	logging.root.addHandler(handler)
-
-	if Args.verbose >= 2:
-		level = logging.DEBUG
-	elif Args.verbose == 1:
-		level = logging.INFO
-	else:
-		level = logging.WARNING
-
-	logging.root.setLevel(level)
-
-	# make killable by ctrl-c
-	logging.debug('setting SIGINT handler')
-	signal.signal(signal.SIGINT, signal.SIG_DFL)
-
-	logging.info('Python Version: %s', sys.version_info)
-	logging.info('GStreamer Version: %s', Gst.version())
-
-	# establish a synchronus connection to server
-	Connection.establish(
-		Args.host if Args.host else Config.get('server', 'host'))
-
-	# fetch config from server
-	Config.fetchServerConfig()
-
-	# Warn when connecting to a non-local core without preview-encoders enabled
-	# the list-comparison is not complete (one could use a local hostname or the local system ip)
-	# but it's only here to warn that one might be making a mistake
-	use_previews = Config.getboolean('previews', 'enabled') and Config.getboolean('previews', 'use')
-	looks_like_localhost = Config.get('server', 'host') in ['::1', '127.0.0.1', 'localhost']
-	if not use_previews and not looks_like_localhost:
-		logging.warn(
-			'Connecting to `%s` (which looks like a remote host) might not work without enabeling '
-			'the preview encoders (set `[previews] enabled=true` on the core) or it might saturate '
-			'your ethernet link between the two machines.',
-			Config.get('server', 'host')
-		)
-
-	# obtain network-clock
-	ClockManager.obtainClock(Connection.ip)
-
-	# switch connection to nonblocking, event-driven mode
-	Connection.enterNonblockingMode()
-
-	# init main-class and main-loop
-	# (this binds all event-hander on the Connection)
-	logging.debug('initializing Voctogui')
-	voctogui = Voctogui()
-
-	# start the Mainloop and show the Window
-	logging.debug('running Voctogui')
-	voctogui.run()
+    # configure logging
+    docolor = (Args.color == 'always') or (Args.color == 'auto' and
+                                           sys.stderr.isatty())
+
+    handler = LogHandler(docolor, Args.timestamp)
+    logging.root.addHandler(handler)
+
+    if Args.verbose >= 2:
+        level = logging.DEBUG
+    elif Args.verbose == 1:
+        level = logging.INFO
+    else:
+        level = logging.WARNING
+
+    logging.root.setLevel(level)
+
+    # make killable by ctrl-c
+    logging.debug('setting SIGINT handler')
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+    logging.info('Python Version: %s', sys.version_info)
+    logging.info('GStreamer Version: %s', Gst.version())
+
+    # establish a synchronus connection to server
+    Connection.establish(
+        Args.host if Args.host else Config.get('server', 'host')
+    )
+
+    # fetch config from server
+    Config.fetchServerConfig()
+
+    # Warn when connecting to a non-local core without preview-encoders enabled
+    # The list-comparison is not complete
+    # (one could use a local hostname or the local system ip),
+    # but it's only here to warn that one might be making a mistake
+    use_previews = (Config.getboolean('previews', 'enabled') and
+                    Config.getboolean('previews', 'use'))
+    looks_like_localhost = Config.get('server', 'host') in ['::1',
+                                                            '127.0.0.1',
+                                                            'localhost']
+    if not use_previews and not looks_like_localhost:
+        logging.warn(
+            'Connecting to `%s` (which looks like a remote host) '
+            'might not work without enabeling the preview encoders '
+            '(set `[previews] enabled=true` on the core) or it might saturate '
+            'your ethernet link between the two machines.',
+            Config.get('server', 'host')
+        )
+
+    # obtain network-clock
+    ClockManager.obtainClock(Connection.ip)
+
+    # switch connection to nonblocking, event-driven mode
+    Connection.enterNonblockingMode()
+
+    # init main-class and main-loop
+    # (this binds all event-hander on the Connection)
+    logging.debug('initializing Voctogui')
+    voctogui = Voctogui()
+
+    # start the Mainloop and show the Window
+    logging.debug('running Voctogui')
+    voctogui.run()
 
 if __name__ == '__main__':
-	main()
+    main()