Apply auto formatting

Author: yncat

accessible_output2/__init__.py

@@ -4,30 +4,33 @@
 import types
 from platform_utils import paths
 
+
 def load_library(libname, cdll=False):
-	if paths.is_frozen():
-		libfile = os.path.join(paths.embedded_data_path(), 'accessible_output2', 'lib', libname)
-	else:
-		libfile = os.path.join(paths.module_path(), 'lib', libname)
-	if cdll:
-		return ctypes.cdll[libfile]
-	else:
-		return ctypes.windll[libfile]
+    if paths.is_frozen():
+        libfile = os.path.join(paths.embedded_data_path(), 'accessible_output2', 'lib', libname)
+    else:
+        libfile = os.path.join(paths.module_path(), 'lib', libname)
+    if cdll:
+        return ctypes.cdll[libfile]
+    else:
+        return ctypes.windll[libfile]
+
 
 def get_output_classes():
-	from . import outputs
-	module_type = types.ModuleType
-	classes = [m.output_class for m in outputs.__dict__.values() if type(m) == module_type and hasattr(m, 'output_class')]
-	return sorted(classes, key=lambda c: c.priority)
+    from . import outputs
+    module_type = types.ModuleType
+    classes = [m.output_class for m in outputs.__dict__.values() if type(m) == module_type and hasattr(m, 'output_class')]
+    return sorted(classes, key=lambda c: c.priority)
+
 
 def find_datafiles():
-	import os
-	import platform
-	from glob import glob
-	import accessible_output2
-	if platform.system() != 'Windows':
-		return []
-	path = os.path.join(accessible_output2.__path__[0], 'lib', '*.dll')
-	results = glob(path)
-	dest_dir = os.path.join('accessible_output2', 'lib')
-	return [(dest_dir, results)]
+    import os
+    import platform
+    from glob import glob
+    import accessible_output2
+    if platform.system() != 'Windows':
+        return []
+    path = os.path.join(accessible_output2.__path__[0], 'lib', '*.dll')
+    results = glob(path)
+    dest_dir = os.path.join('accessible_output2', 'lib')
+    return [(dest_dir, results)]

accessible_output2/outputs/__init__.py

@@ -1,20 +1,20 @@
 from __future__ import absolute_import
 import platform
 if platform.system() == 'Windows':
-	from . import nvda
-	from . import jaws
-	from . import sapi5
-	from . import window_eyes
-	from . import system_access
-	from . import dolphin
-	from . import pc_talker
-	#import sapi4
+    from . import nvda
+    from . import jaws
+    from . import sapi5
+    from . import window_eyes
+    from . import system_access
+    from . import dolphin
+    from . import pc_talker
+    #import sapi4
 
 if platform.system() == 'Darwin':
-	from . import nsSpeechSynth
-	from . import voiceover
+    from . import nsSpeechSynth
+    from . import voiceover
 
 if platform.system() == 'Linux':
-	from . import e_speak
+    from . import e_speak
 
 from . import auto

accessible_output2/outputs/auto.py

@@ -2,44 +2,46 @@
 import accessible_output2
 from .base import Output, OutputError
 
+
 class Auto(Output):
 
-	def __init__(self):
-		output_classes = accessible_output2.get_output_classes()
-		self.outputs = []
-		for output in output_classes:
-			try:
-				self.outputs.append(output())
-			except OutputError:
-				pass
-
-	def get_first_available_output(self):
-		for output in self.outputs:
-			if output.is_active():
-				return output
-		return None
-
-	def speak(self, *args, **kwargs):
-		output = self.get_first_available_output()
-		if output:
-			output.speak(*args, **kwargs)
-
-	def silence(self):
-		output = self.get_first_available_output()
-		if output:
-			if output.silence: output.silence()
-
-	def braille(self, *args, **kwargs):
-		output = self.get_first_available_output()
-		if output:
-			output.braille(*args, **kwargs)
-
-	def output(self, *args, **kwargs):
-		output = self.get_first_available_output()
-		if output:
-			output.speak(*args, **kwargs)
-
-	def is_system_output(self):
-		output = self.get_first_available_output()
-		if output:
-			return output.is_system_output()
+    def __init__(self):
+        output_classes = accessible_output2.get_output_classes()
+        self.outputs = []
+        for output in output_classes:
+            try:
+                self.outputs.append(output())
+            except OutputError:
+                pass
+
+    def get_first_available_output(self):
+        for output in self.outputs:
+            if output.is_active():
+                return output
+        return None
+
+    def speak(self, *args, **kwargs):
+        output = self.get_first_available_output()
+        if output:
+            output.speak(*args, **kwargs)
+
+    def silence(self):
+        output = self.get_first_available_output()
+        if output:
+            if output.silence:
+                output.silence()
+
+    def braille(self, *args, **kwargs):
+        output = self.get_first_available_output()
+        if output:
+            output.braille(*args, **kwargs)
+
+    def output(self, *args, **kwargs):
+        output = self.get_first_available_output()
+        if output:
+            output.speak(*args, **kwargs)
+
+    def is_system_output(self):
+        output = self.get_first_available_output()
+        if output:
+            return output.is_system_output()

accessible_output2/outputs/base.py

@@ -1,47 +1,49 @@
 from accessible_output2 import load_library
 import platform
 
+
 class OutputError(Exception):
-	pass
+    pass
+
 
 class Output(object):
-	name = "Unnamed Output"
-	lib32 = None
-	lib64 = None
-	argtypes = {}
-	cdll = False
-	priority = 100
-	system_output = False
-
-	def __init__(self):
-		self.is_32bit = platform.architecture()[0] == "32bit"
-		if self.lib32 and self.is_32bit:
-			self.lib = load_library(self.lib32, cdll=self.cdll)
-		elif self.lib64:
-			self.lib = load_library(self.lib64, cdll=self.cdll)
-		else:
-			self.lib = None
-		if self.lib is not None:
-			for func in self.argtypes:
-				try:
-					getattr(self.lib, func).argtypes = self.argtypes[func]
-				except AttributeError:
-					pass
-
-	def output(self, text, **options):
-		output = False
-		if self.speak(text, **options):
-			output = True
-		if self.braille(text, **options):
-			output = True
-		if not output:
-			raise RuntimeError("Output %r does not have any method defined to output" % self)
-
-	def is_system_output(self):
-		return self.system_output
-
-	def speak(self, text, **options):
-		return False
-
-	def braille(self, text, **options):
-		return False
+    name = "Unnamed Output"
+    lib32 = None
+    lib64 = None
+    argtypes = {}
+    cdll = False
+    priority = 100
+    system_output = False
+
+    def __init__(self):
+        self.is_32bit = platform.architecture()[0] == "32bit"
+        if self.lib32 and self.is_32bit:
+            self.lib = load_library(self.lib32, cdll=self.cdll)
+        elif self.lib64:
+            self.lib = load_library(self.lib64, cdll=self.cdll)
+        else:
+            self.lib = None
+        if self.lib is not None:
+            for func in self.argtypes:
+                try:
+                    getattr(self.lib, func).argtypes = self.argtypes[func]
+                except AttributeError:
+                    pass
+
+    def output(self, text, **options):
+        output = False
+        if self.speak(text, **options):
+            output = True
+        if self.braille(text, **options):
+            output = True
+        if not output:
+            raise RuntimeError("Output %r does not have any method defined to output" % self)
+
+    def is_system_output(self):
+        return self.system_output
+
+    def speak(self, text, **options):
+        return False
+
+    def braille(self, text, **options):
+        return False

accessible_output2/outputs/dolphin.py

@@ -4,30 +4,32 @@
 
 from .base import Output
 
+
 class Dolphin (Output):
-	"""Supports dolphin products."""
-
-	name = 'Dolphin'
-	lib32 = 'dolapi.dll'
-	argtypes = {
-		'DolAccess_Command': (ctypes.c_wchar_p, ctypes.c_int, ctypes.c_int),
-		'DolAccess_Action': (ctypes.c_int,),
-	}
-
-	def speak(self, text, interrupt=0):
-		if interrupt:
-			self.silence()
-		#If we don't call this, the API won't let us speak.
-		if self.is_active():
-			self.lib.DolAccess_Command(text, (len(text)*2)+2, 1)
-
-	def silence(self):
-		self.lib.DolAccess_Action(141)
-
-	def is_active(self):
-		try:
-			return self.lib.DolAccess_GetSystem() in (1, 4, 8)
-		except:
-			return False
+    """Supports dolphin products."""
+
+    name = 'Dolphin'
+    lib32 = 'dolapi.dll'
+    argtypes = {
+        'DolAccess_Command': (ctypes.c_wchar_p, ctypes.c_int, ctypes.c_int),
+        'DolAccess_Action': (ctypes.c_int,),
+    }
+
+    def speak(self, text, interrupt=0):
+        if interrupt:
+            self.silence()
+        # If we don't call this, the API won't let us speak.
+        if self.is_active():
+            self.lib.DolAccess_Command(text, (len(text) * 2) + 2, 1)
+
+    def silence(self):
+        self.lib.DolAccess_Action(141)
+
+    def is_active(self):
+        try:
+            return self.lib.DolAccess_GetSystem() in (1, 4, 8)
+        except BaseException:
+            return False
+
 
 output_class = Dolphin

accessible_output2/outputs/e_speak.py

@@ -2,30 +2,33 @@
 from .base import Output
 
 try:
-	import espeak.core
-except:
-	raise RuntimeError("Cannot find espeak.core. Please install python-espeak")
+    import espeak.core
+except BaseException:
+    raise RuntimeError("Cannot find espeak.core. Please install python-espeak")
+
 
 class ESpeak(Output):
-	"""Speech output supporting ESpeak on Linux
-				Note this requires python-espeak to be installed
-				This can be done on Debian distros by using apt-get install python-espeak
-				Or through this tarball: https://launchpad.net/python-espeak
-	"""
-	name = "Linux ESpeak"
-
-	def is_active(self):
-		try:
-			import espeak.core
-		except:
-			return False
-		return True
-
-	def speak(self, text, interrupt = 0):
-		if interrupt:
-			self.silence()
-		espeak.core.synth(text)
-	def silence(self):
-		espeak.core.cancel()
+    """Speech output supporting ESpeak on Linux
+                            Note this requires python-espeak to be installed
+                            This can be done on Debian distros by using apt-get install python-espeak
+                            Or through this tarball: https://launchpad.net/python-espeak
+    """
+    name = "Linux ESpeak"
+
+    def is_active(self):
+        try:
+            import espeak.core
+        except BaseException:
+            return False
+        return True
+
+    def speak(self, text, interrupt=0):
+        if interrupt:
+            self.silence()
+        espeak.core.synth(text)
+
+    def silence(self):
+        espeak.core.cancel()
+
 
 output_class = ESpeak