[orca] Simplify some verbose conditional expressions.
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Simplify some verbose conditional expressions.
- Date: Mon, 6 Jun 2016 00:52:57 +0000 (UTC)
commit 41959f76fe6fe0fc08b7f66c6eddb02876a9d805
Author: Mario Lang <mlang delysid org>
Date: Mon Jun 6 02:38:52 2016 +0200
Simplify some verbose conditional expressions.
src/orca/flat_review.py | 9 ++++-----
src/orca/liveregions.py | 7 ++-----
src/orca/scripts/toolkits/clutter/script.py | 10 +---------
src/orca/scripts/web/script_utilities.py | 6 +-----
src/orca/speechdispatcherfactory.py | 5 +----
5 files changed, 9 insertions(+), 28 deletions(-)
---
diff --git a/src/orca/flat_review.py b/src/orca/flat_review.py
index b3bc342..741e4eb 100644
--- a/src/orca/flat_review.py
+++ b/src/orca/flat_review.py
@@ -649,13 +649,12 @@ class Context:
while zoneIndex < len(line.zones):
zone = line.zones[zoneIndex]
if zone.accessible == accessible:
- if (caretOffset >= zone.startOffset):
- if (caretOffset \
- < (zone.startOffset + zone.length)):
+ if caretOffset >= zone.startOffset:
+ endOffset = zone.startOffset + zone.length
+ if caretOffset < endOffset:
foundZoneWithCaret = True
break
- elif (caretOffset \
- == (zone.startOffset + zone.length)):
+ elif caretOffset == endOffset:
checkForEOF = True
lineToCheck = lineIndex
zoneToCheck = zoneIndex
diff --git a/src/orca/liveregions.py b/src/orca/liveregions.py
index ad41002..2794e8a 100644
--- a/src/orca/liveregions.py
+++ b/src/orca/liveregions.py
@@ -247,11 +247,8 @@ class LiveRegionManager:
self.msg_queue.purgeByKeepAlive()
# See you again soon, stay in event loop if we still have messages.
- if len(self.msg_queue) > 0:
- return True
- else:
- return False
-
+ return len(self.msg_queue) > 0
+
def getLiveNoneObjects(self):
"""Return the live objects that are registered and have a politeness
of LIVE_NONE. """
diff --git a/src/orca/scripts/toolkits/clutter/script.py b/src/orca/scripts/toolkits/clutter/script.py
index 65c5406..3074573 100644
--- a/src/orca/scripts/toolkits/clutter/script.py
+++ b/src/orca/scripts/toolkits/clutter/script.py
@@ -64,15 +64,7 @@ def _computeIsText(string):
Arguments:
- string: a string representation of a keyboardEvent.
"""
- is_text = False
-
- if string:
- if _unicharIsPrint(string):
- is_text = True
- else:
- is_text = False
-
- return is_text
+ return string and _unicharIsPrint(string)
class Script(default.Script):
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index a73824d..3dd5441 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -2207,11 +2207,7 @@ class Utilities(script_utilities.Utilities):
if rv is not None:
return rv
- role = obj.getRole()
- if role == pyatspi.ROLE_TOOL_TIP:
- rv = True
- else:
- rv = False
+ rv = obj.getRole() == pyatspi.ROLE_TOOL_TIP
self._isNonNavigablePopup[hash(obj)] = rv
return rv
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index 70c15bd..fcb0e23 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -103,10 +103,7 @@ class SpeechServer(speechserver.SpeechServer):
@staticmethod
def getSpeechServer(info=None):
- if info is not None:
- thisId = info[1]
- else:
- thisId = SpeechServer.DEFAULT_SERVER_ID
+ thisId = info[1] if info is not None else SpeechServer.DEFAULT_SERVER_ID
return SpeechServer._getSpeechServer(thisId)
@staticmethod
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]