GNOME.org
 

[orca] More efficient iteration.

commit 4934a5bd582c5872f8b955f232368b2ec353aae1
Author: Mario Lang <mlang delysid org>
Date:   Sat Jun 4 11:25:46 2016 -0400

    More efficient iteration.
    
    There is no need to do for var in list(iterable), for var in iterable
    is more efficient.

 src/orca/acss.py                    |    2 +-
 src/orca/backends/json_backend.py   |    6 +++---
 src/orca/event_manager.py           |   10 +++++-----
 src/orca/formatting.py              |    2 +-
 src/orca/generator.py               |    2 +-
 src/orca/liveregions.py             |    6 +++---
 src/orca/orca_gui_prefs.py          |    2 +-
 src/orca/script.py                  |    4 ++--
 src/orca/script_manager.py          |    2 +-
 src/orca/script_utilities.py        |    2 +-
 src/orca/scripts/default.py         |    2 +-
 src/orca/scripts/web/bookmarks.py   |    2 +-
 src/orca/settings_manager.py        |   12 ++++++------
 src/orca/speechdispatcherfactory.py |    2 +-
 src/orca/structural_navigation.py   |    4 ++--
 src/orca/text_attribute_names.py    |    2 +-
 16 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/src/orca/acss.py b/src/orca/acss.py
index 9712e2f..5cb1838 100644
--- a/src/orca/acss.py
+++ b/src/orca/acss.py
@@ -73,7 +73,7 @@ class ACSS(dict):
                     #
                     if k == ACSS.FAMILY:
                         self[k] = {}
-                        for j in list(props[k].keys()):
+                        for j in props[k].keys():
                             self[k][j] = props[k][j]
                     else:
                         self[k] = props[k]
diff --git a/src/orca/backends/json_backend.py b/src/orca/backends/json_backend.py
index 466279d..b6c9246 100644
--- a/src/orca/backends/json_backend.py
+++ b/src/orca/backends/json_backend.py
@@ -124,9 +124,9 @@ class Backend:
         self._getSettings()
         generalSettings = self.general.copy()
         profileSettings = self.profiles[profile].copy()
-        for key, value in list(profileSettings.items()):
+        for key, value in profileSettings.items():
             if key == 'voices':
-                for voiceType, voiceDef in list(value.items()):
+                for voiceType, voiceDef in value.items():
                     value[voiceType] = acss.ACSS(voiceDef)
             if key not in ['startingProfile', 'activeProfile']:
                 generalSettings[key] = value
@@ -183,7 +183,7 @@ class Backend:
         self._getSettings()
         profiles = []
 
-        for profileName in list(self.profiles.keys()):
+        for profileName in self.profiles.keys():
             profileDict = self.profiles[profileName].copy()
             profiles.append(profileDict.get('profile'))
 
diff --git a/src/orca/event_manager.py b/src/orca/event_manager.py
index 384f50d..1bd9615 100644
--- a/src/orca/event_manager.py
+++ b/src/orca/event_manager.py
@@ -80,7 +80,7 @@ class EventManager:
 
         debug.println(debug.LEVEL_INFO, 'EVENT MANAGER: Dectivating', True)
         self._active = False
-        for eventType in list(self._scriptListenerCounts.keys()):
+        for eventType in self._scriptListenerCounts.keys():
             self.registry.deregisterEventListener(self._enqueue, eventType)
         self._scriptListenerCounts = {}
         self.deregisterKeystrokeListener(self._processKeyboardEvent)
@@ -422,7 +422,7 @@ class EventManager:
         msg = 'EVENT MANAGER: registering listeners for: %s' % script
         debug.println(debug.LEVEL_INFO, msg, True)
 
-        for eventType in list(script.listeners.keys()):
+        for eventType in script.listeners.keys():
             self._registerListener(eventType)
 
     def deregisterScriptListeners(self, script):
@@ -436,19 +436,19 @@ class EventManager:
         msg = 'EVENT MANAGER: deregistering listeners for: %s' % script
         debug.println(debug.LEVEL_INFO, msg, True)
 
-        for eventType in list(script.listeners.keys()):
+        for eventType in script.listeners.keys():
             self._deregisterListener(eventType)
 
     def registerModuleListeners(self, listeners):
         """Register the listeners on behalf of the caller."""
 
-        for eventType, function in list(listeners.items()):
+        for eventType, function in listeners.items():
             self.registry.registerEventListener(function, eventType)
 
     def deregisterModuleListeners(self, listeners):
         """Deegister the listeners on behalf of the caller."""
 
-        for eventType, function in list(listeners.items()):
+        for eventType, function in listeners.items():
             self.registry.deregisterEventListener(function, eventType)
 
     def registerKeystrokeListener(self, function, mask=None, kind=None):
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 49e34b0..521b4aa 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -854,7 +854,7 @@ class Formatting(dict):
         self.update(copy.deepcopy(formatting))
 
     def update(self, newDict):
-        for key, val in list(newDict.items()):
+        for key, val in newDict.items():
             if key in self:
                 if isinstance(self[key], dict) and isinstance(val, dict):
                     self[key].update(val)
diff --git a/src/orca/generator.py b/src/orca/generator.py
index 344fd6c..043da61 100644
--- a/src/orca/generator.py
+++ b/src/orca/generator.py
@@ -96,7 +96,7 @@ class Generator:
         # for the results of all the legal method names.
         #
         globalsDict = {}
-        for key in list(self._methodsDict.keys()):
+        for key in self._methodsDict.keys():
             globalsDict[key] = []
         self._addGlobals(globalsDict)
 
diff --git a/src/orca/liveregions.py b/src/orca/liveregions.py
index dbc84ab..ad41002 100644
--- a/src/orca/liveregions.py
+++ b/src/orca/liveregions.py
@@ -175,7 +175,7 @@ class LiveRegionManager:
         # objects that are not registered for this page
         newpoliteness = {}
         currenturi = self._script.bookmarks.getURIKey()
-        for key, value in list(self._politenessOverrides.items()):
+        for key, value in self._politenessOverrides.items():
             if key[0] == currenturi or value != LIVE_NONE:
                 newpoliteness[key] = value
         self._politenessOverrides = newpoliteness
@@ -340,7 +340,7 @@ class LiveRegionManager:
             self._restoreOverrides = copy.copy(self._politenessOverrides)
 
             # Set all politeness overrides to LIVE_OFF.
-            for override in list(self._politenessOverrides.keys()):
+            for override in self._politenessOverrides.keys():
                 self._politenessOverrides[override] = LIVE_OFF
 
             # look through all the objects on the page and set/add to
@@ -356,7 +356,7 @@ class LiveRegionManager:
 
         # The user wants to restore politeness levels
         else:
-            for key, value in list(self._restoreOverrides.items()):
+            for key, value in self._restoreOverrides.items():
                 self._politenessOverrides[key] = value
             self._script.presentMessage(messages.LIVE_REGIONS_ALL_RESTORED)
             # Toggle our flag
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 3a5092f..95aee00 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -2022,7 +2022,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         self._markModified()
         iterBB = self._createNode(guilabels.KB_GROUP_BRAILLE)
         self.bbindings = self.script.getBrailleBindings()
-        for com, inputEvHand in list(self.bbindings.items()):
+        for com, inputEvHand in self.bbindings.items():
             handl = self.script.getInputEventHandlerKey(inputEvHand)
             self._insertRowBraille(handl, com, inputEvHand, iterBB)
 
diff --git a/src/orca/script.py b/src/orca/script.py
index a717023..6d5737c 100644
--- a/src/orca/script.py
+++ b/src/orca/script.py
@@ -197,7 +197,7 @@ class Script:
         braille.py) that match the given inputEventHandler passed.
         """
         return [command
-                for command, handler in list(self.brailleBindings.items())
+                for command, handler in self.brailleBindings.items()
                 if inputEventHandler == handler]
 
     def getFormatting(self):
@@ -373,7 +373,7 @@ class Script:
         # to the order in which they were added.  So...we need to do something
         # different here.  Logged as bugzilla bug 319781.]]]
         #
-        for key in list(self.listeners.keys()):
+        for key in self.listeners.keys():
             if event.type.startswith(key):
                 self.listeners[key](event)
 
diff --git a/src/orca/script_manager.py b/src/orca/script_manager.py
index 53b2189..aa6d1ef 100644
--- a/src/orca/script_manager.py
+++ b/src/orca/script_manager.py
@@ -298,7 +298,7 @@ class ScriptManager:
             except KeyError:
                 pass
             else:
-                for toolkitScript in list(toolkitScripts.values()):
+                for toolkitScript in toolkitScripts.values():
                     del toolkitScript
 
             del app
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 959055d..4e89e6c 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -2482,7 +2482,7 @@ class Utilities:
         otherwise.
         """
 
-        for key, value in list(self._script.attributeNamesDict.items()):
+        for key, value in self._script.attributeNamesDict.items():
             if value == attribName:
                 return key
 
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 0721b92..6f19337 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -525,7 +525,7 @@ class Script(script.Script):
         passed as argument
         """
 
-        for keyName, handler in list(self.inputEventHandlers.items()):
+        for keyName, handler in self.inputEventHandlers.items():
             if handler == inputEventHandler:
                 return keyName
 
diff --git a/src/orca/scripts/web/bookmarks.py b/src/orca/scripts/web/bookmarks.py
index ac1998a..6b8b582 100644
--- a/src/orca/scripts/web/bookmarks.py
+++ b/src/orca/scripts/web/bookmarks.py
@@ -69,7 +69,7 @@ class Bookmarks(bookmarks.Bookmarks):
         """Save the bookmarks for this script."""
 
         saved = {}
-        for index, bookmark in list(self._bookmarks.items()):
+        for index, bookmark in self._bookmarks.items():
             saved[index] = bookmark[0], bookmark[1]
 
         try:
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index e61a7b3..f825fee 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -228,12 +228,12 @@ class SettingsManager(object):
             return self.customizedSettings
 
         originalSettings = {}
-        for key, value in list(settings.__dict__.items()):
+        for key, value in settings.__dict__.items():
             originalSettings[key] = value
 
         self._customizationCompleted = self._loadUserCustomizations()
 
-        for key, value in list(originalSettings.items()):
+        for key, value in originalSettings.items():
             customValue = settings.__dict__.get(key)
             if value != customValue:
                 self.customizedSettings[key] = customValue
@@ -370,10 +370,10 @@ class SettingsManager(object):
             orca_i18n.setLocaleForGUI(newVoiceLocale)
 
     def _setSettingsRuntime(self, settingsDict):
-        for key, value in list(settingsDict.items()):
+        for key, value in settingsDict.items():
             setattr(settings, str(key), value)
         self._getCustomizedSettings()
-        for key, value in list(self.customizedSettings.items()):
+        for key, value in self.customizedSettings.items():
             setattr(settings, str(key), value)
 
     def _setPronunciationsRuntime(self, pronunciationsDict):
@@ -405,7 +405,7 @@ class SettingsManager(object):
         as the profile's."""
         self.profileGeneral = {}
 
-        for key, value in list(general.items()):
+        for key, value in general.items():
             if key in ['startingProfile', 'activeProfile']:
                 continue
             elif key == 'profile':
@@ -493,7 +493,7 @@ class SettingsManager(object):
 
     def overrideKeyBindings(self, script, scriptKeyBindings):
         keybindingsSettings = self.profileKeybindings
-        for handlerString, bindingTuples in list(keybindingsSettings.items()):
+        for handlerString, bindingTuples in keybindingsSettings.items():
             handler = script.inputEventHandlers.get(handlerString)
             if not handler:
                 continue
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index 524d357..bf41814 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -110,7 +110,7 @@ class SpeechServer(speechserver.SpeechServer):
     getSpeechServer = staticmethod(getSpeechServer)
 
     def shutdownActiveServers():
-        for server in list(SpeechServer._active_servers.values()):
+        for server in SpeechServer._active_servers.values():
             server.shutdown()
     shutdownActiveServers = staticmethod(shutdownActiveServers)
 
diff --git a/src/orca/structural_navigation.py b/src/orca/structural_navigation.py
index ee14b81..418ebd2 100644
--- a/src/orca/structural_navigation.py
+++ b/src/orca/structural_navigation.py
@@ -703,7 +703,7 @@ class StructuralNavigation:
                 self.toggleStructuralNavigation,
                 cmdnames.STRUCTURAL_NAVIGATION_TOGGLE)
 
-        for structuralNavigationObject in list(self.enabledObjects.values()):
+        for structuralNavigationObject in self.enabledObjects.values():
             self.inputEventHandlers.update(\
                 structuralNavigationObject.inputEventHandlers)
             self.functions.extend(structuralNavigationObject.functions)
@@ -726,7 +726,7 @@ class StructuralNavigation:
                 keybindings.ORCA_MODIFIER_MASK,
                 self.inputEventHandlers["toggleStructuralNavigationHandler"]))
 
-        for structuralNavigationObject in list(self.enabledObjects.values()):
+        for structuralNavigationObject in self.enabledObjects.values():
             bindings = structuralNavigationObject.keyBindings.keyBindings
             for keybinding in bindings:
                 keyBindings.add(keybinding)
diff --git a/src/orca/text_attribute_names.py b/src/orca/text_attribute_names.py
index 4bbd27d..6bdf23f 100644
--- a/src/orca/text_attribute_names.py
+++ b/src/orca/text_attribute_names.py
@@ -754,7 +754,7 @@ def getTextAttributeKey(localizedTextAttr):
     localized text attribute.
     """
 
-    for key, value in list(_textAttributeTable.items()):
+    for key, value in _textAttributeTable.items():
         if value == localizedTextAttr:
             return key
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]