[orca] Return an empty list when generate displayed text fails to obtain a result



commit 5287022e77df914d4ba153abeaae71d4be03cde4
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Jul 3 12:46:28 2019 -0400

    Return an empty list when generate displayed text fails to obtain a result

 src/orca/speech_generator.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 67112e440..f1e4a7b56 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -998,18 +998,19 @@ class SpeechGenerator(generator.Generator):
 
     def _generateDisplayedText(self, obj, **args):
         result = self._generateSubstring(obj, **args)
-        if result:
+        if result and result[0]:
             return result
 
         acss = self.voice(DEFAULT)
         result = generator.Generator._generateDisplayedText(self, obj, **args)
-        if result:
-            string = result[0].strip()
-            if len(string) == 1 and self._script.utilities.isMath(obj):
-                charname = chnames.getCharacterName(string, preferMath=True)
-                if charname != string:
-                    result[0] = charname
+        if not (result and result[0]):
+            return []
 
+        string = result[0].strip()
+        if len(string) == 1 and self._script.utilities.isMath(obj):
+            charname = chnames.getCharacterName(string, preferMath=True)
+            if charname != string:
+                result[0] = charname
             result.extend(acss)
 
         return result


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]