orca r4336 - in trunk: . src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Mon Nov 17 18:15:32 2008
New Revision: 4336
URL: http://svn.gnome.org/viewvc/orca?rev=4336&view=rev

Log:
Pylint fixes.


Modified:
   trunk/ChangeLog
   trunk/src/orca/gnomespeechfactory.py
   trunk/src/orca/settings.py

Modified: trunk/src/orca/gnomespeechfactory.py
==============================================================================
--- trunk/src/orca/gnomespeechfactory.py	(original)
+++ trunk/src/orca/gnomespeechfactory.py	Mon Nov 17 18:15:32 2008
@@ -1131,7 +1131,7 @@
             debug.println(debug.LEVEL_SEVERE,
                           "Something looks wrong with speech.  Aborting.")
             debug.printStack(debug.LEVEL_ALL)
-            orca.abort(50)
+            orca.die(50)
         else:
             self.__lastResetTime = time.time()
 

Modified: trunk/src/orca/settings.py
==============================================================================
--- trunk/src/orca/settings.py	(original)
+++ trunk/src/orca/settings.py	Mon Nov 17 18:15:32 2008
@@ -29,9 +29,6 @@
 
 import os
 import re
-import shutil
-
-import platform
 
 screenWidth = 640
 screenHeight = 480
@@ -849,7 +846,7 @@
     """
     prefix = "/desktop/gnome/applications/at/visual/"
     try:
-	return ("orca" in gconfClient.get_string(prefix + "exec")) \
+        return ("orca" in gconfClient.get_string(prefix + "exec")) \
            and gconfClient.get_bool(prefix + "startup")
     except:
         return False