GNOME.org
 

[orca] Consistently use "is" and "is not" to compare against singleton None.

commit 63dcb904156ba7c2e8f3cada206d5f792df0ae16
Author: Mario Lang <mlang delysid org>
Date:   Mon Jun 6 00:23:40 2016 +0200

    Consistently use "is" and "is not" to compare against singleton None.
    
    This is more idiomatic and actually also more efficient:
    python2
    1 == None: 0.0425 usec
    1 != None: 0.0432 usec
    1 is None: 0.0256 usec
    1 is not None: 0.0257 usec
    python3
    1 == None: 0.0351 usec
    1 != None: 0.0389 usec
    1 is None: 0.0226 usec
    1 is not None: 0.0219

 src/orca/event_manager.py                          |    8 +++---
 src/orca/input_event.py                            |    4 +-
 src/orca/label_inference.py                        |    4 +-
 src/orca/orca_bin.py.in                            |    4 +-
 src/orca/orca_gui_prefs.py                         |   24 ++++++++++----------
 src/orca/pronunciation_dict.py                     |    2 +-
 src/orca/script.py                                 |    4 +-
 src/orca/script_manager.py                         |    4 +-
 src/orca/script_utilities.py                       |    2 +-
 src/orca/scripts/apps/Thunderbird/script.py        |    4 +-
 .../scripts/apps/evolution/braille_generator.py    |    2 +-
 src/orca/scripts/apps/evolution/script.py          |    2 +-
 .../scripts/apps/evolution/speech_generator.py     |   12 +++++-----
 src/orca/scripts/apps/soffice/script_utilities.py  |    4 +-
 src/orca/scripts/default.py                        |    4 +-
 src/orca/scripts/toolkits/WebKitGtk/script.py      |    2 +-
 .../scripts/toolkits/WebKitGtk/script_utilities.py |    4 +-
 src/orca/scripts/web/braille_generator.py          |    2 +-
 src/orca/scripts/web/script.py                     |   10 ++++----
 src/orca/scripts/web/script_utilities.py           |    2 +-
 src/orca/settings_manager.py                       |    2 +-
 21 files changed, 53 insertions(+), 53 deletions(-)
---
diff --git a/src/orca/event_manager.py b/src/orca/event_manager.py
index 1bd9615..776768e 100644
--- a/src/orca/event_manager.py
+++ b/src/orca/event_manager.py
@@ -457,10 +457,10 @@ class EventManager:
         msg = 'EVENT MANAGER: registering keystroke listener function: %s' % function
         debug.println(debug.LEVEL_INFO, msg, True)
 
-        if mask == None:
+        if mask is None:
             mask = list(range(256))
 
-        if kind == None:
+        if kind is None:
             kind = (pyatspi.KEY_PRESSED_EVENT, pyatspi.KEY_RELEASED_EVENT)
 
         self.registry.registerKeystrokeListener(function, mask=mask, kind=kind)
@@ -471,10 +471,10 @@ class EventManager:
         msg = 'EVENT MANAGER: deregistering keystroke listener function: %s' % function
         debug.println(debug.LEVEL_INFO, msg, True)
 
-        if mask == None:
+        if mask is None:
             mask = list(range(256))
 
-        if kind == None:
+        if kind is None:
             kind = (pyatspi.KEY_PRESSED_EVENT, pyatspi.KEY_RELEASED_EVENT)
 
         self.registry.deregisterKeystrokeListener(
diff --git a/src/orca/input_event.py b/src/orca/input_event.py
index 76c1785..d0fb0f2 100644
--- a/src/orca/input_event.py
+++ b/src/orca/input_event.py
@@ -163,7 +163,7 @@ class KeyboardEvent(InputEvent):
         elif self.isLockingKey():
             self.keyType = KeyboardEvent.TYPE_LOCKING
             self.shouldEcho = settings.presentLockingKeys
-            if self.shouldEcho == None:
+            if self.shouldEcho is None:
                 self.shouldEcho = not settings.onlySpeakDisplayedText
             self.shouldEcho = self.shouldEcho and _isPressed
         elif self.isAlphabeticKey():
@@ -445,7 +445,7 @@ class KeyboardEvent(InputEvent):
         include when presenting a locking key."""
 
         locked = self.getLockingState()
-        if locked == None:
+        if locked is None:
             return ''
 
         if not locked:
diff --git a/src/orca/label_inference.py b/src/orca/label_inference.py
index a75e062..5b8342d 100644
--- a/src/orca/label_inference.py
+++ b/src/orca/label_inference.py
@@ -192,7 +192,7 @@ class LabelInference:
             return False
 
         rv = self._isWidgetCache.get(hash(obj))
-        if rv != None:
+        if rv is not None:
             return rv
 
         widgetRoles = [pyatspi.ROLE_CHECK_BOX,
@@ -538,7 +538,7 @@ class LabelInference:
             return None, []
 
         cells = [table.getAccessibleAt(i, col) for i in range(1, table.nRows)]
-        cells = [x for x in cells if x != None]
+        cells = [x for x in cells if x is not None]
         if [x for x in cells if x.childCount and x[0].getRole() != obj.getRole()]:
             return None, []
 
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
index 94edaf3..6a01713 100644
--- a/src/orca/orca_bin.py.in
+++ b/src/orca/orca_bin.py.in
@@ -48,7 +48,7 @@ from orca.orca_platform import version
 class ListApps(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
         try:
-            apps = filter(lambda x: x != None, pyatspi.Registry.getDesktop(0))
+            apps = filter(lambda x: x is not None, pyatspi.Registry.getDesktop(0))
             names = [app.name for app in apps]
         except:
             pass
@@ -173,7 +173,7 @@ def inGraphicalDesktop():
     except:
         return False
 
-    return display != None
+    return display is not None
 
 def otherOrcas():
     """Returns the pid of any other instances of Orca owned by this user."""
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 95aee00..ea92f3c 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -557,19 +557,19 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
         self._setSpeechFamiliesChoice(familyName)
 
         rate = self._getRateForVoiceType(voiceType)
-        if rate != None:
+        if rate is not None:
             self.get_widget("rateScale").set_value(rate)
         else:
             self.get_widget("rateScale").set_value(50.0)
             
         pitch = self._getPitchForVoiceType(voiceType)
-        if pitch != None:
+        if pitch is not None:
             self.get_widget("pitchScale").set_value(pitch)
         else:
             self.get_widget("pitchScale").set_value(5.0)
 
         volume = self._getVolumeForVoiceType(voiceType)
-        if volume != None:
+        if volume is not None:
             self.get_widget("volumeScale").set_value(volume)
         else:
             self.get_widget("volumeScale").set_value(10.0)
@@ -1885,10 +1885,10 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
 
         model = self.keyBindingsModel
 
-        if parent == None:
+        if parent is None:
             parent = self._getIterOf(guilabels.KB_GROUP_DEFAULT)
 
-        if parent != None:
+        if parent is not None:
             myiter = model.append(parent)
             if not kb.keysymstring:
                 text = None
@@ -1906,7 +1906,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
             model.set_value(myiter, MOD_USED1, str(kb.modifiers))
             model.set_value(myiter, KEY1, kb.keysymstring)
             model.set_value(myiter, CLICK_COUNT1, str(kb.click_count))
-            if text != None:
+            if text is not None:
                 model.set_value(myiter, OLDTEXT1, text)
                 model.set_value(myiter, TEXT1, text)
             model.set_value(myiter, MODIF, modif)
@@ -1932,10 +1932,10 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
 
         model = self.keyBindingsModel
 
-        if parent == None:
+        if parent is None:
             parent = self._getIterOf(guilabels.KB_GROUP_BRAILLE)
 
-        if parent != None:
+        if parent is not None:
             myiter = model.append(parent)
             model.set_value(myiter, HANDLER, handl)
             model.set_value(myiter, DESCRIP, inputEvHand.description)
@@ -1959,9 +1959,9 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
             treeModel = self.keyBindingsModel
 
             myiter = treeModel.get_iter_first()
-            while myiter != None:
+            while myiter is not None:
                 iterChild = treeModel.iter_children(myiter)
-                while iterChild != None:
+                while iterChild is not None:
                     descrip = treeModel.get_value(iterChild, DESCRIP)
                     keyBind.handler = \
                         input_event.InputEventHandler(None, descrip)
@@ -2991,7 +2991,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
             self.prefsDict["speechServerInfo"] = \
                 self.speechServersChoice.getInfo()
 
-        if self.defaultVoice != None:
+        if self.defaultVoice is not None:
             self.prefsDict["voices"] = {
                 settings.DEFAULT_VOICE: acss.ACSS(self.defaultVoice),
                 settings.UPPERCASE_VOICE: acss.ACSS(self.uppercaseVoice),
@@ -3133,7 +3133,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
                 and profileToSave != 'default':
             saveActiveProfile()
         else:
-            if profileToSave != None:
+            if profileToSave is not None:
                 message = guilabels.PROFILE_CONFLICT_MESSAGE % \
                     ("<b>%s</b>" % profileToSaveLabel)
                 dialog = Gtk.MessageDialog(None,
diff --git a/src/orca/pronunciation_dict.py b/src/orca/pronunciation_dict.py
index 36b72ea..b1989cc 100644
--- a/src/orca/pronunciation_dict.py
+++ b/src/orca/pronunciation_dict.py
@@ -61,7 +61,7 @@ def setPronunciation(word, replacementString, pronunciations=None):
     """
 
     key = word.lower()
-    if pronunciations != None:
+    if pronunciations is not None:
         pronunciations[key] = [ word, replacementString ]
     else:
         pronunciation_dict[key] = [ word, replacementString ]
diff --git a/src/orca/script.py b/src/orca/script.py
index 6d5737c..d213697 100644
--- a/src/orca/script.py
+++ b/src/orca/script.py
@@ -469,7 +469,7 @@ class Script:
                 if consumes:
                     self._lastCommandWasStructNav = True
             else:
-                consumes = handler != None
+                consumes = handler is not None
         if not consumes:
             handler = self.keyBindings.getInputHandler(keyboardEvent)
             if handler \
@@ -478,7 +478,7 @@ class Script:
                 if consumes:
                     self._lastCommandWasStructNav = True
             else:
-                consumes = handler != None
+                consumes = handler is not None
         return consumes
 
     def consumesBrailleEvent(self, brailleEvent):
diff --git a/src/orca/script_manager.py b/src/orca/script_manager.py
index aa6d1ef..131868c 100644
--- a/src/orca/script_manager.py
+++ b/src/orca/script_manager.py
@@ -96,7 +96,7 @@ class ScriptManager:
         """Returns the module name of the script to use for application app."""
 
         try:
-            appAndNameExist = app != None and app.name != ''
+            appAndNameExist = app is not None and app.name != ''
         except (LookupError, RuntimeError):
             appAndNameExist = False
             msg = 'ERROR: %s no longer exists' % app
@@ -284,7 +284,7 @@ class ScriptManager:
 
         appList = list(self.appScripts.keys())
         try:
-            appList = [a for a in appList if a != None and a not in self._desktop]
+            appList = [a for a in appList if a is not None and a not in self._desktop]
         except:
             debug.printException(debug.LEVEL_FINEST)
             return
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 4e89e6c..7b4b7df 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -662,7 +662,7 @@ class Utilities:
         isToolbar = lambda x: x and x.getRole() == pyatspi.ROLE_TOOL_BAR
         toolbar = pyatspi.findAncestor(obj, isToolbar)
 
-        return toolbar != None
+        return toolbar is not None
 
     def isComboBoxWithToggleDescendant(self, obj):
         return False
diff --git a/src/orca/scripts/apps/Thunderbird/script.py b/src/orca/scripts/apps/Thunderbird/script.py
index 97096a3..33bd9f9 100644
--- a/src/orca/scripts/apps/Thunderbird/script.py
+++ b/src/orca/scripts/apps/Thunderbird/script.py
@@ -63,9 +63,9 @@ class Script(Gecko.Script):
         #
         self._lastAutoComplete = ""
 
-        if _settingsManager.getSetting('sayAllOnLoad') == None:
+        if _settingsManager.getSetting('sayAllOnLoad') is None:
             _settingsManager.setSetting('sayAllOnLoad', False)
-        if _settingsManager.getSetting('pageSummaryOnLoad') == None:
+        if _settingsManager.getSetting('pageSummaryOnLoad') is None:
             _settingsManager.setSetting('pageSummaryOnLoad', False)
 
         super().__init__(app)
diff --git a/src/orca/scripts/apps/evolution/braille_generator.py 
b/src/orca/scripts/apps/evolution/braille_generator.py
index fb329a8..77d9e0d 100644
--- a/src/orca/scripts/apps/evolution/braille_generator.py
+++ b/src/orca/scripts/apps/evolution/braille_generator.py
@@ -38,7 +38,7 @@ class BrailleGenerator(WebKitGtk.BrailleGenerator, braille_generator.BrailleGene
     def _isMessageListToggleCell(self, obj):
         cached = self._cache.get(hash(obj), {})
         rv = cached.get("isMessageListToggleCell")
-        if rv == None:
+        if rv is None:
             rv = self._script.utilities.isMessageListToggleCell(obj)
             cached["isMessageListToggleCell"] = rv
             self._cache[hash(obj)] = cached
diff --git a/src/orca/scripts/apps/evolution/script.py b/src/orca/scripts/apps/evolution/script.py
index b4e0743..af68154 100644
--- a/src/orca/scripts/apps/evolution/script.py
+++ b/src/orca/scripts/apps/evolution/script.py
@@ -56,7 +56,7 @@ class Script(WebKitGtk.Script, gtk.Script):
         - app: the application to create a script for.
         """
 
-        if _settingsManager.getSetting('sayAllOnLoad') == None:
+        if _settingsManager.getSetting('sayAllOnLoad') is None:
             _settingsManager.setSetting('sayAllOnLoad', False)
 
         super().__init__(app)
diff --git a/src/orca/scripts/apps/evolution/speech_generator.py 
b/src/orca/scripts/apps/evolution/speech_generator.py
index ce71c0c..9280401 100644
--- a/src/orca/scripts/apps/evolution/speech_generator.py
+++ b/src/orca/scripts/apps/evolution/speech_generator.py
@@ -39,7 +39,7 @@ class SpeechGenerator(WebKitGtk.SpeechGenerator, speech_generator.SpeechGenerato
     def _isTreeTableCell(self, obj):
         cached = self._cache.get(hash(obj), {})
         rv = cached.get("isTreeTableCell")
-        if rv == None:
+        if rv is None:
             rv = obj.parent and obj.parent.getRole() == pyatspi.ROLE_TREE_TABLE
             cached["isTreeTableCell"] = rv
             self._cache[hash(obj)] = cached
@@ -49,7 +49,7 @@ class SpeechGenerator(WebKitGtk.SpeechGenerator, speech_generator.SpeechGenerato
     def _isMessageListStatusCell(self, obj):
         cached = self._cache.get(hash(obj), {})
         rv = cached.get("isMessageListStatusCell")
-        if rv == None:
+        if rv is None:
             rv = self._script.utilities.isMessageListStatusCell(obj)
             cached["isMessageListStatusCell"] = rv
             self._cache[hash(obj)] = cached
@@ -59,7 +59,7 @@ class SpeechGenerator(WebKitGtk.SpeechGenerator, speech_generator.SpeechGenerato
     def _isMessageListToggleCell(self, obj):
         cached = self._cache.get(hash(obj), {})
         rv = cached.get("isMessageListToggleCell")
-        if rv == None:
+        if rv is None:
             rv = self._script.utilities.isMessageListToggleCell(obj)
             cached["isMessageListToggleCell"] = rv
             self._cache[hash(obj)] = cached
@@ -69,7 +69,7 @@ class SpeechGenerator(WebKitGtk.SpeechGenerator, speech_generator.SpeechGenerato
     def _isFocused(self, obj):
         cached = self._cache.get(hash(obj), {})
         rv = cached.get("isFocused")
-        if rv == None:
+        if rv is None:
             rv = obj.getState().contains(pyatspi.STATE_FOCUSED)
             cached["isFocused"] = rv
             self._cache[hash(obj)] = cached
@@ -79,7 +79,7 @@ class SpeechGenerator(WebKitGtk.SpeechGenerator, speech_generator.SpeechGenerato
     def _isChecked(self, obj):
         cached = self._cache.get(hash(obj), {})
         rv = cached.get("isChecked")
-        if rv == None:
+        if rv is None:
             rv = obj.getState().contains(pyatspi.STATE_CHECKED)
             cached["isChecked"] = rv
             self._cache[hash(obj)] = cached
@@ -89,7 +89,7 @@ class SpeechGenerator(WebKitGtk.SpeechGenerator, speech_generator.SpeechGenerato
     def _isInNewRow(self, obj):
         cached = self._cache.get(hash(obj), {})
         rv = cached.get("isInNewRow")
-        if rv == None:
+        if rv is None:
             row, column = self._script.utilities.coordinatesForCell(obj)
             lastRow = self._script.pointOfReference.get("lastRow")
             rv = row != lastRow
diff --git a/src/orca/scripts/apps/soffice/script_utilities.py 
b/src/orca/scripts/apps/soffice/script_utilities.py
index 534e593..587055f 100644
--- a/src/orca/scripts/apps/soffice/script_utilities.py
+++ b/src/orca/scripts/apps/soffice/script_utilities.py
@@ -241,8 +241,8 @@ class Utilities(script_utilities.Utilities):
         if headersRow == objRow or headersCol == objCol:
             return None, None
 
-        getRowHeader = headersCol != None
-        getColHeader = headersRow != None
+        getRowHeader = headersCol is not None
+        getColHeader = headersRow is not None
         if onlyIfNew:
             getRowHeader = \
                 getRowHeader and objRow != self._script.pointOfReference.get("lastRow")
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 6f19337..f8fb9bd 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -1772,7 +1772,7 @@ class Script(script.Script):
         except AttributeError:
             pass
         else:
-            if offset == None:
+            if offset is None:
                 offset = text.caretOffset
             speech.sayAll(self.textLines(obj, offset),
                           self.__sayAllProgressCallback)
@@ -3478,7 +3478,7 @@ class Script(script.Script):
 
         self._inSayAll = True
         length = text.characterCount
-        if offset == None:
+        if offset is None:
             offset = text.caretOffset
 
         # Determine the correct "say all by" mode to use.
diff --git a/src/orca/scripts/toolkits/WebKitGtk/script.py b/src/orca/scripts/toolkits/WebKitGtk/script.py
index d31582b..67bea33 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/script.py
+++ b/src/orca/scripts/toolkits/WebKitGtk/script.py
@@ -70,7 +70,7 @@ class Script(default.Script):
         self._lastCaretContext = None, -1
         self.sayAllOnLoadCheckButton = None
 
-        if _settingsManager.getSetting('sayAllOnLoad') == None:
+        if _settingsManager.getSetting('sayAllOnLoad') is None:
             _settingsManager.setSetting('sayAllOnLoad', True)
 
     def setupInputEventHandlers(self):
diff --git a/src/orca/scripts/toolkits/WebKitGtk/script_utilities.py 
b/src/orca/scripts/toolkits/WebKitGtk/script_utilities.py
index 02064a0..da90371 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/script_utilities.py
+++ b/src/orca/scripts/toolkits/WebKitGtk/script_utilities.py
@@ -144,9 +144,9 @@ class Utilities(script_utilities.Utilities):
         if not string:
             return [(obj, 0, 1, '')]
 
-        if offset == None:
+        if offset is None:
             offset = text.caretOffset
-        if boundary == None:
+        if boundary is None:
             start = 0
             end = text.characterCount
         else:
diff --git a/src/orca/scripts/web/braille_generator.py b/src/orca/scripts/web/braille_generator.py
index c1c54b5..4aab94a 100644
--- a/src/orca/scripts/web/braille_generator.py
+++ b/src/orca/scripts/web/braille_generator.py
@@ -73,7 +73,7 @@ class BrailleGenerator(braille_generator.BrailleGenerator):
                                  pyatspi.ROLE_TABLE_CELL,
                                  pyatspi.ROLE_PANEL])
 
-        if args.get('startOffset') != None and args.get('endOffset') != None:
+        if args.get('startOffset') is not None and args.get('endOffset') is not None:
             doNotDisplay.append(pyatspi.ROLE_ALERT)
 
         result = []
diff --git a/src/orca/scripts/web/script.py b/src/orca/scripts/web/script.py
index fa82fe2..04b2559 100644
--- a/src/orca/scripts/web/script.py
+++ b/src/orca/scripts/web/script.py
@@ -80,11 +80,11 @@ class Script(default.Script):
         self._inFocusMode = False
         self._focusModeIsSticky = False
 
-        if _settingsManager.getSetting('caretNavigationEnabled') == None:
+        if _settingsManager.getSetting('caretNavigationEnabled') is None:
             _settingsManager.setSetting('caretNavigationEnabled', True)
-        if _settingsManager.getSetting('sayAllOnLoad') == None:
+        if _settingsManager.getSetting('sayAllOnLoad') is None:
             _settingsManager.setSetting('sayAllOnLoad', True)
-        if _settingsManager.getSetting('pageSummaryOnLoad') == None:
+        if _settingsManager.getSetting('pageSummaryOnLoad') is None:
             _settingsManager.setSetting('pageSummaryOnLoad', True)
 
         self._changedLinesOnlyCheckButton = None
@@ -524,7 +524,7 @@ class Script(default.Script):
 
         sayAllStyle = _settingsManager.getSetting('sayAllStyle')
         sayAllBySentence = sayAllStyle == settings.SAYALL_STYLE_SENTENCE
-        if offset == None:
+        if offset is None:
             obj, characterOffset = self.utilities.getCaretContext()
         else:
             characterOffset = offset
@@ -561,7 +561,7 @@ class Script(default.Script):
             if (obj, characterOffset) == (lastObj, lastOffset):
                 obj, characterOffset = self.utilities.findNextCaretInOrder(lastObj, lastOffset)
 
-            done = (obj == None)
+            done = obj is None
 
         self._inSayAll = False
         self._sayAllContents = []
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index c563b27..a73824d 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -1206,7 +1206,7 @@ class Utilities(script_utilities.Utilities):
             if self.findObjectInContents(obj, offset, self._currentLineContents) != -1:
                 return self._currentLineContents
 
-        if layoutMode == None:
+        if layoutMode is None:
             layoutMode = _settingsManager.getSetting('layoutMode')
 
         objects = []
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index f825fee..0ead65d 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -216,7 +216,7 @@ class SettingsManager(object):
         self.defaultGeneral = {}
         for key in settings.userCustomizableSettings:
             value = self.customizedSettings.get(key)
-            if value == None:
+            if value is None:
                 try:
                     value = getattr(settings, key)
                 except:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]