diff --git a/accessible_output2/outputs/auto.py b/accessible_output2/outputs/auto.py index a6f7a24..e492584 100644 --- a/accessible_output2/outputs/auto.py +++ b/accessible_output2/outputs/auto.py @@ -51,7 +51,7 @@ def braille(self, *args, **kwargs): def output(self, *args, **kwargs): output = self.get_first_available_output() if output: - output.speak(*args, **kwargs) + output.output(*args, **kwargs) def is_system_output(self): """Returns True if this output is a system output.""" diff --git a/accessible_output2/outputs/base.py b/accessible_output2/outputs/base.py index 7d96dbc..964cda7 100644 --- a/accessible_output2/outputs/base.py +++ b/accessible_output2/outputs/base.py @@ -65,9 +65,9 @@ def output(self, text, **options): RuntimeError: If the requested output doesn't define either speak or braille. """ output = False - if self.speak(text, **options): + if self.speak(text, **options) is not False: output = True - if self.braille(text, **options): + if self.braille(text, **options) is not False: output = True if not output: raise RuntimeError( diff --git a/setup.py b/setup.py index 83c29ab..10c8b09 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,10 @@ packages=find_packages(), package_data={"accessible_output2": ["lib/*"]}, zip_safe=False, - install_requires=["libloader", "platform_utils"], + install_requires=[ + "libloader", + "platform_utils @ git+https://github.com/accessibleapps/platform_utils.git" + ], extras_require={ ':sys_platform == "win32"': ["pywin32", "libloader"], ':sys_platform == "darwin"': ["appscript"],