[orca] Reversing the previous patch as it introduces a new problem. :-(



commit 6dcac703b6aadc98115737cb435bc7f15d328b09
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Tue Aug 24 14:55:56 2010 -0400

    Reversing the previous patch as it introduces a new problem. :-(

 src/orca/scripts/toolkits/Gecko/script.py |    4 ++--
 src/orca/speechdispatcherfactory.py       |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 8489db0..3444d9d 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -5294,9 +5294,9 @@ class Script(default.Script):
                 utterance = self.speechGenerator.generateSpeech(obj)
             else:
                 utterance = [string]
-                utterance.append(self.voices.get(settings.DEFAULT_VOICE))
                 if speakRole and not role in doNotSpeakRoles:
-                    utterance.extend(self.speechGenerator.getRoleName(obj))
+                    utterance.extend(\
+                        self.speechGenerator.getRoleName(obj))
   
             # If the object is a heading, or is contained within a heading,
             # speak that role information at the end of the object.
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index ef53afb..06a0995 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -310,8 +310,6 @@ class SpeechServer(speechserver.SpeechServer):
         return newText.encode("UTF-8")
 
     def _speak(self, text, acss, **kwargs):
-        if not isinstance(text, str):
-            text = ''
         text = self.__addVerbalizedPunctuation(text)
         # Replace no break space characters with plain spaces since some
         # synthesizers cannot handle them.  See bug #591734.



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