[orca/new-settings] Fix a traceback when there is not an orca-customizations. Remove an additional line left in debuging

[Joanmarie Diggs <joanied src gnome org>]

commit d749a5915f091d8a149bff5ec3fba40078df8c6c
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Fri Dec 10 19:00:30 2010 -0500

    Fix a traceback when there is not an orca-customizations. Remove an additional line left in debuging output.

 src/orca/settings_manager.py        |    5 +++--
 src/orca/speechdispatcherfactory.py |    1 -
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index 5e383ad..cdb3848 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -193,12 +193,13 @@ class SettingsManager(object):
 
     def _loadUserCustomizations(self):
         pathList = [settings.userPrefsDir]
-        (fileHnd, moduleName, desc) = imp.find_module("orca-customizations", pathList)
         try:
+            (fileHnd, moduleName, desc) = \
+                imp.find_module("orca-customizations", pathList)
             imp.load_module("orca-customizations", fileHnd, moduleName, desc)
         except:
             pass
-        finally:
+        else:
             fileHnd.close()
 
     def _getGeneral(self, profile=None):
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index baecf97..29cc40f 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -129,7 +129,6 @@ class SpeechServer(speechserver.SpeechServer):
     getSpeechServer = staticmethod(getSpeechServer)
 
     def shutdownActiveServers():
-        if not SpeechServer._active_servers:
         for server in SpeechServer._active_servers.values():
             server.shutdown()
     shutdownActiveServers = staticmethod(shutdownActiveServers)