[orca] Begin preparation for moving to Python 3
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Begin preparation for moving to Python 3
- Date: Tue, 1 May 2012 02:03:43 +0000 (UTC)
commit d638878bfa0bdeedfd821a1a19ce8e90a11f1bf0
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Mon Apr 30 19:41:21 2012 -0400
Begin preparation for moving to Python 3
src/orca/app_prefs.py | 6 +-
src/orca/backends/json_backend.py | 4 +-
src/orca/braille.py | 6 +-
src/orca/common_keyboardmap.py | 2 +-
src/orca/event_manager.py | 4 +-
src/orca/formatting.py | 52 ++++++++++----------
src/orca/generator.py | 7 ++-
src/orca/input_event.py | 2 +-
src/orca/keybindings.py | 2 +-
src/orca/laptop_keyboardmap.py | 24 +++++-----
src/orca/liveregions.py | 2 +-
src/orca/orca_console_prefs.py | 2 +-
src/orca/orca_gui_prefs.py | 26 +++++-----
src/orca/script_utilities.py | 42 ++++++++--------
src/orca/scripts/apps/ddu/script_utilities.py | 4 +-
src/orca/scripts/default.py | 4 +-
.../scripts/toolkits/Gecko/braille_generator.py | 2 +-
src/orca/scripts/toolkits/Gecko/script.py | 6 +-
.../scripts/toolkits/Gecko/script_utilities.py | 2 +-
.../scripts/toolkits/Gecko/speech_generator.py | 2 +-
src/orca/scripts/toolkits/WebKitGtk/script.py | 2 +-
src/orca/settings.py | 8 ++--
src/orca/speech_generator.py | 12 ++--
src/orca/speechdispatcherfactory.py | 2 +-
src/orca/structural_navigation.py | 6 +-
test/harness/quit.py | 8 ++--
test/harness/settings_test.py | 8 ++--
test/keystrokes/firefox/orca_bookmarks.py | 16 +++---
test/keystrokes/firefox/xul_role_check_box.py | 2 +-
test/keystrokes/firefox/xul_role_combo_box.py | 2 +-
test/keystrokes/firefox/xul_role_entry.py | 2 +-
test/keystrokes/firefox/xul_role_list_item.py | 2 +-
test/keystrokes/firefox/xul_role_page_tab.py | 2 +-
test/keystrokes/firefox/xul_role_push_button.py | 2 +-
test/keystrokes/firefox/xul_role_tree.py | 2 +-
test/keystrokes/firefox/xul_role_tree_table.py | 2 +-
test/keystrokes/gcalctool/gcalctool01.py | 4 +-
test/keystrokes/gtk-demo/role_table.py | 4 +-
test/keystrokes/java/role_check_box.py | 2 +-
test/keystrokes/oobase/bug_463172.py | 4 +-
test/keystrokes/oobase/bug_465109.py | 4 +-
test/keystrokes/ooimpress/bug_462239.py | 2 +-
test/keystrokes/ooimpress/bug_462256.py | 4 +-
test/keystrokes/ooimpress/bug_462547.py | 4 +-
test/keystrokes/ooimpress/bug_465449.py | 2 +-
test/keystrokes/oowriter/bug_353268.py | 2 +-
test/keystrokes/oowriter/bug_355733.py | 4 +-
test/keystrokes/oowriter/bug_361624.py | 2 +-
test/keystrokes/oowriter/bug_361747.py | 2 +-
test/keystrokes/oowriter/bug_362979.py | 2 +-
test/keystrokes/oowriter/bug_364765.py | 2 +-
test/keystrokes/oowriter/bug_382408.py | 2 +-
test/keystrokes/oowriter/bug_382415.py | 2 +-
test/keystrokes/oowriter/bug_382418.py | 4 +-
test/keystrokes/oowriter/bug_382880.py | 2 +-
test/keystrokes/oowriter/bug_382888.py | 2 +-
test/keystrokes/oowriter/bug_384893.py | 2 +-
test/keystrokes/oowriter/bug_385828.py | 4 +-
test/keystrokes/oowriter/bug_413909.py | 4 +-
test/keystrokes/oowriter/bug_430402.py | 4 +-
test/keystrokes/oowriter/bug_435201.py | 2 +-
test/keystrokes/oowriter/bug_435226.py | 2 +-
test/keystrokes/oowriter/bug_450210.py | 2 +-
test/keystrokes/oowriter/bug_546941.py | 2 +-
test/keystrokes/oowriter/row_inserted.py | 2 +-
test/keystrokes/oowriter/table_cells.py | 2 +-
.../oowriter/table_cells_structural_navigation1.py | 2 +-
67 files changed, 182 insertions(+), 181 deletions(-)
---
diff --git a/src/orca/app_prefs.py b/src/orca/app_prefs.py
index c53f74e..7c7c328 100644
--- a/src/orca/app_prefs.py
+++ b/src/orca/app_prefs.py
@@ -39,9 +39,9 @@ _settingsManager = getattr(orca, '_settingsManager')
# The same fields than in orca_gui_prefs.py:
#
(HANDLER, DESCRIP, MOD_MASK1, MOD_USED1, KEY1, CLICK_COUNT1, OLDTEXT1, \
- TEXT1, MODIF, EDITABLE) = range(10)
+ TEXT1, MODIF, EDITABLE) = list(range(10))
-(ACTUAL, REPLACEMENT) = range(2)
+(ACTUAL, REPLACEMENT) = list(range(2))
class OrcaPrefs:
@@ -137,7 +137,7 @@ class OrcaPrefs:
while thisIter != None:
iterChild = treeModel.iter_children(thisIter)
while iterChild != None:
- values = treeModel.get(iterChild, 0,1,2,3,4,5,6,7,8,9)
+ values = treeModel.get(iterChild, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
if values[MODIF]:
self._writeKeyBinding(prefs, values)
iterChild = treeModel.iter_next(iterChild)
diff --git a/src/orca/backends/json_backend.py b/src/orca/backends/json_backend.py
index ea342db..b792623 100644
--- a/src/orca/backends/json_backend.py
+++ b/src/orca/backends/json_backend.py
@@ -117,7 +117,7 @@ class Backend:
self._getSettings()
pronunciations = self.pronunciations.copy()
profileSettings = self.profiles[profile].copy()
- if profileSettings.has_key('pronunciations'):
+ if 'pronunciations' in profileSettings:
pronunciations = profileSettings['pronunciations']
return pronunciations
@@ -127,7 +127,7 @@ class Backend:
self._getSettings()
keybindings = self.keybindings.copy()
profileSettings = self.profiles[profile].copy()
- if profileSettings.has_key('keybindings'):
+ if 'keybindings' in profileSettings:
keybindings = profileSettings['keybindings']
return keybindings
diff --git a/src/orca/braille.py b/src/orca/braille.py
index 75e63ac..d77341e 100644
--- a/src/orca/braille.py
+++ b/src/orca/braille.py
@@ -764,7 +764,7 @@ class Text(Region):
while n < nLinks:
link = hyperText.getLink(n)
if self.lineOffset <= link.startIndex:
- for i in xrange(link.startIndex, link.endIndex):
+ for i in range(link.startIndex, link.endIndex):
try:
regionMask[i] |= linkIndicator
except:
@@ -792,7 +792,7 @@ class Text(Region):
if mask != settings.TEXT_ATTR_BRAILLE_NONE:
maskStart = max(startOffset - self.lineOffset, 0)
maskEnd = min(endOffset - self.lineOffset, stringLength)
- for i in xrange(maskStart, maskEnd):
+ for i in range(maskStart, maskEnd):
regionMask[i] |= attrIndicator
if selIndicator:
@@ -800,7 +800,7 @@ class Text(Region):
for startOffset, endOffset in selections:
maskStart = max(startOffset - self.lineOffset, 0)
maskEnd = min(endOffset - self.lineOffset, stringLength)
- for i in xrange(maskStart, maskEnd):
+ for i in range(maskStart, maskEnd):
regionMask[i] |= selIndicator
if self.contracted:
diff --git a/src/orca/common_keyboardmap.py b/src/orca/common_keyboardmap.py
index 75a08dc..fe02b0f 100644
--- a/src/orca/common_keyboardmap.py
+++ b/src/orca/common_keyboardmap.py
@@ -183,7 +183,7 @@ keymap = (
("", defaultModifierMask, NO_MODIFIER_MASK,
"panBrailleLeftHandler"),
- ("",defaultModifierMask, NO_MODIFIER_MASK,
+ ("", defaultModifierMask, NO_MODIFIER_MASK,
"panBrailleRightHandler"),
("", defaultModifierMask, NO_MODIFIER_MASK,
diff --git a/src/orca/event_manager.py b/src/orca/event_manager.py
index cb302ec..01ba50d 100644
--- a/src/orca/event_manager.py
+++ b/src/orca/event_manager.py
@@ -361,7 +361,7 @@ class EventManager:
% function)
if mask == None:
- mask = range(256)
+ mask = list(range(256))
if kind == None:
kind = (pyatspi.KEY_PRESSED_EVENT, pyatspi.KEY_RELEASED_EVENT)
@@ -377,7 +377,7 @@ class EventManager:
% function)
if mask == None:
- mask = range(256)
+ mask = list(range(256))
if kind == None:
kind = (pyatspi.KEY_PRESSED_EVENT, pyatspi.KEY_RELEASED_EVENT)
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 93c6273..639cf29 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -50,31 +50,31 @@ formatting = {
####################################################################
'strings' : {
- 'speech' : {
- 'required' : settings.speechRequiredStateString,
- 'readonly' : settings.speechReadOnlyString,
- 'insensitive' : settings.speechInsensitiveString,
- 'checkbox' : settings.speechCheckboxIndicators,
- 'radiobutton' : settings.speechRadioButtonIndicators,
- 'togglebutton' : settings.speechToggleButtonIndicators,
- 'expansion' : settings.speechExpansionIndicators,
- 'nodelevel' : settings.speechNodeLevelString,
- 'nestinglevel' : settings.speechNestingLevelString,
- 'multiselect' : settings.speechMultiSelectString,
- 'iconindex' : settings.speechIconIndexString,
- 'groupindex' : settings.speechGroupIndexString,
+ 'speech': {
+ 'required': settings.speechRequiredStateString,
+ 'readonly': settings.speechReadOnlyString,
+ 'insensitive': settings.speechInsensitiveString,
+ 'checkbox': settings.speechCheckboxIndicators,
+ 'radiobutton': settings.speechRadioButtonIndicators,
+ 'togglebutton': settings.speechToggleButtonIndicators,
+ 'expansion': settings.speechExpansionIndicators,
+ 'nodelevel': settings.speechNodeLevelString,
+ 'nestinglevel': settings.speechNestingLevelString,
+ 'multiselect': settings.speechMultiSelectString,
+ 'iconindex': settings.speechIconIndexString,
+ 'groupindex': settings.speechGroupIndexString,
},
- 'braille' : {
- 'eol' : settings.brailleEOLIndicator,
- 'required' : settings.brailleRequiredStateString,
- 'readonly' : settings.brailleReadOnlyString,
- 'insensitive' : settings.brailleInsensitiveString,
- 'checkbox' : settings.brailleCheckBoxIndicators,
- 'radiobutton' : settings.brailleRadioButtonIndicators,
- 'togglebutton' : settings.brailleToggleButtonIndicators,
- 'expansion' : settings.brailleExpansionIndicators,
- 'nodelevel' : settings.brailleNodeLevelString,
- 'nestinglevel' : settings.brailleNestingLevelString,
+ 'braille': {
+ 'eol': settings.brailleEOLIndicator,
+ 'required': settings.brailleRequiredStateString,
+ 'readonly': settings.brailleReadOnlyString,
+ 'insensitive': settings.brailleInsensitiveString,
+ 'checkbox': settings.brailleCheckBoxIndicators,
+ 'radiobutton': settings.brailleRadioButtonIndicators,
+ 'togglebutton': settings.brailleToggleButtonIndicators,
+ 'expansion': settings.brailleExpansionIndicators,
+ 'nodelevel': settings.brailleNodeLevelString,
+ 'nestinglevel': settings.brailleNestingLevelString,
},
},
@@ -503,7 +503,7 @@ formatting = {
pyatspi.ROLE_TABLE_CELL: {
'unfocused': 'tableCellRow',
},
- 'REAL_ROLE_TABLE_CELL' : {
+ 'REAL_ROLE_TABLE_CELL': {
'unfocused': '(tableCell2ChildToggle + tableCell2ChildLabel)\
or (cellCheckedState\
+ (columnHeaderIfToggleAndNoText and [Region(" "), Component(obj, asString(columnHeaderIfToggleAndNoText))])\
@@ -617,7 +617,7 @@ class Formatting(dict):
def update(self, newDict):
for key, val in newDict.iteritems():
- if self.has_key(key):
+ if key in self:
if isinstance(self[key], dict) and isinstance(val, dict):
self[key].update(val)
elif isinstance(self[key], basestring) \
diff --git a/src/orca/generator.py b/src/orca/generator.py
index 8fc3aca..bb2641e 100644
--- a/src/orca/generator.py
+++ b/src/orca/generator.py
@@ -36,6 +36,7 @@ import debug
import settings
from orca_i18n import _ # for gettext support
+import collections
def _formatExceptionInfo(maxTBlevel=5):
cla, exc, trbk = sys.exc_info()
@@ -71,7 +72,7 @@ class Generator:
self._script = script
self._methodsDict = {}
for method in \
- filter(lambda z: callable(z),
+ filter(lambda z: isinstance(z, collections.Callable),
map(lambda y: getattr(self, y).__get__(self, self.__class__),
filter(lambda x: x.startswith(METHOD_PREFIX),
dir(self)))):
@@ -122,7 +123,7 @@ class Generator:
arg = info[1][0]
arg = arg.replace("name '", "")
arg = arg.replace("' is not defined", "")
- if not self._methodsDict.has_key(arg):
+ if arg not in self._methodsDict:
debug.printException(debug.LEVEL_SEVERE)
debug.println(
debug.LEVEL_SEVERE,
@@ -248,7 +249,7 @@ class Generator:
arg = info[1][0]
arg = arg.replace("name '", "")
arg = arg.replace("' is not defined", "")
- if not self._methodsDict.has_key(arg):
+ if arg not in self._methodsDict:
debug.printException(debug.LEVEL_SEVERE)
debug.println(
debug.LEVEL_SEVERE,
diff --git a/src/orca/input_event.py b/src/orca/input_event.py
index 3a7a635..8fdfb19 100644
--- a/src/orca/input_event.py
+++ b/src/orca/input_event.py
@@ -231,7 +231,7 @@ class KeyboardEvent(InputEvent):
return self.event_string in \
["F1", "F2", "F3", "F4", "F5", "F6",
- "F7","F8", "F9", "F10", "F11", "F12"]
+ "F7", "F8", "F9", "F10", "F11", "F12"]
def isLockingKey(self):
"""Return True if this is a locking key."""
diff --git a/src/orca/keybindings.py b/src/orca/keybindings.py
index 652ea6c..49d09ac 100644
--- a/src/orca/keybindings.py
+++ b/src/orca/keybindings.py
@@ -412,7 +412,7 @@ class KeyBindings:
except:
clickCount = 1
- if handlers.has_key(handler):
+ if handler in handlers:
# add the keybinding
self.add(KeyBinding( \
keysymstring, modifierMask, modifiers, \
diff --git a/src/orca/laptop_keyboardmap.py b/src/orca/laptop_keyboardmap.py
index 4fed6f6..ef51dcb 100644
--- a/src/orca/laptop_keyboardmap.py
+++ b/src/orca/laptop_keyboardmap.py
@@ -61,16 +61,16 @@ keymap = (
"sayAllHandler"),
("Return", defaultModifierMask, ORCA_MODIFIER_MASK,
- "whereAmIBasicHandler",1),
+ "whereAmIBasicHandler", 1),
("Return", defaultModifierMask, ORCA_MODIFIER_MASK,
- "whereAmIDetailedHandler",2),
+ "whereAmIDetailedHandler", 2),
("slash", defaultModifierMask, ORCA_MODIFIER_MASK,
- "getTitleHandler",1),
+ "getTitleHandler", 1),
("slash", defaultModifierMask, ORCA_MODIFIER_MASK,
- "getStatusBarHandler",2),
+ "getStatusBarHandler", 2),
("bracketleft", defaultModifierMask, ORCA_MODIFIER_MASK,
"findHandler"),
@@ -88,13 +88,13 @@ keymap = (
"reviewHomeHandler"),
("i", defaultModifierMask, ORCA_MODIFIER_MASK,
- "reviewCurrentLineHandler",1),
+ "reviewCurrentLineHandler", 1),
("i", defaultModifierMask, ORCA_MODIFIER_MASK,
- "reviewSpellCurrentLineHandler",2),
+ "reviewSpellCurrentLineHandler", 2),
("i", defaultModifierMask, ORCA_MODIFIER_MASK,
- "reviewPhoneticCurrentLineHandler",3),
+ "reviewPhoneticCurrentLineHandler", 3),
("o", defaultModifierMask, ORCA_MODIFIER_MASK,
"reviewNextLineHandler"),
@@ -109,13 +109,13 @@ keymap = (
"reviewAboveHandler"),
("k", defaultModifierMask, ORCA_MODIFIER_MASK,
- "reviewCurrentItemHandler",1),
+ "reviewCurrentItemHandler", 1),
("k", defaultModifierMask, ORCA_MODIFIER_MASK,
- "reviewSpellCurrentItemHandler",2),
+ "reviewSpellCurrentItemHandler", 2),
("k", defaultModifierMask, ORCA_MODIFIER_MASK,
- "reviewPhoneticCurrentItemHandler",3),
+ "reviewPhoneticCurrentItemHandler", 3),
("k", defaultModifierMask, ORCA_CTRL_MODIFIER_MASK,
"reviewCurrentAccessibleHandler"),
@@ -133,10 +133,10 @@ keymap = (
"reviewEndOfLineHandler"),
("comma", defaultModifierMask, ORCA_MODIFIER_MASK,
- "reviewCurrentCharacterHandler",1),
+ "reviewCurrentCharacterHandler", 1),
("comma", defaultModifierMask, ORCA_MODIFIER_MASK,
- "reviewSpellCurrentCharacterHandler",2),
+ "reviewSpellCurrentCharacterHandler", 2),
("comma", defaultModifierMask, ORCA_MODIFIER_MASK,
"reviewUnicodeCurrentCharacterHandler", 3),
diff --git a/src/orca/liveregions.py b/src/orca/liveregions.py
index 9f80951..fe5e18d 100644
--- a/src/orca/liveregions.py
+++ b/src/orca/liveregions.py
@@ -288,7 +288,7 @@ class LiveRegionManager:
self._script.setCaretPosition(self.lastliveobj, 0)
self._script.outlineAccessible(self.lastliveobj)
self._script.speakContents(self._script.getObjectContentsAtOffset(\
- self.lastliveobj,0))
+ self.lastliveobj, 0))
def reviewLiveAnnouncement(self, msgnum):
"""Speak the given number cached message"""
diff --git a/src/orca/orca_console_prefs.py b/src/orca/orca_console_prefs.py
index 8f18029..b813967 100644
--- a/src/orca/orca_console_prefs.py
+++ b/src/orca/orca_console_prefs.py
@@ -552,7 +552,7 @@ def showPreferencesUI(commandLineSettings):
# Sanity check for bug #642285
#
- if not prefsDict.has_key('profile'):
+ if 'profile' not in prefsDict:
prefsDict['profile'] = settings.profile
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index b63291f..6b8d256 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -67,21 +67,21 @@ from orca_i18n import _ # for gettext support
from orca_i18n import C_ # to provide qualified translatable strings
(HANDLER, DESCRIP, MOD_MASK1, MOD_USED1, KEY1, CLICK_COUNT1, OLDTEXT1, \
- TEXT1, MODIF, EDITABLE) = range(10)
+ TEXT1, MODIF, EDITABLE) = list(range(10))
-(NAME, IS_SPOKEN, IS_BRAILLED, VALUE) = range(4)
+(NAME, IS_SPOKEN, IS_BRAILLED, VALUE) = list(range(4))
-(ACTUAL, REPLACEMENT) = range(2)
+(ACTUAL, REPLACEMENT) = list(range(2))
# Must match the order of voice types in the GtkBuilder file.
#
-(DEFAULT, UPPERCASE, HYPERLINK, SYSTEM) = range(4)
+(DEFAULT, UPPERCASE, HYPERLINK, SYSTEM) = list(range(4))
# Must match the order that the timeFormatCombo is populated.
#
(TIME_FORMAT_LOCALE, TIME_FORMAT_24_HMS,
TIME_FORMAT_24_HMS_WITH_WORDS, TIME_FORMAT_24_HM,
- TIME_FORMAT_24_HM_WITH_WORDS) = range(5)
+ TIME_FORMAT_24_HM_WITH_WORDS) = list(range(5))
# Must match the order that the dateFormatCombo is populated.
#
@@ -90,7 +90,7 @@ from orca_i18n import C_ # to provide qualified translatable strings
DATE_FORMAT_FULL_DM, DATE_FORMAT_FULL_MD, DATE_FORMAT_FULL_DMY,
DATE_FORMAT_FULL_MDY, DATE_FORMAT_FULL_YMD, DATE_FORMAT_ABBREVIATED_DM,
DATE_FORMAT_ABBREVIATED_MD, DATE_FORMAT_ABBREVIATED_DMY,
- DATE_FORMAT_ABBREVIATED_MDY, DATE_FORMAT_ABBREVIATED_YMD) = range(16)
+ DATE_FORMAT_ABBREVIATED_MDY, DATE_FORMAT_ABBREVIATED_YMD) = list(range(16))
class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
@@ -659,7 +659,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
# (usually the default one) is selected
#
selectedIndex = 0
- if self.selectedFamilyChoices.has_key(self.speechServersChoice):
+ if self.speechServersChoice in self.selectedFamilyChoices:
selectedIndex = self.selectedFamilyChoices[self.speechServersChoice]
self.get_widget("speechFamilies").set_active(selectedIndex)
@@ -2053,7 +2053,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
while iterChild != None:
descrip = treeModel.get_value(iterChild, DESCRIP)
keyBind.handler = \
- input_event.InputEventHandler(None,descrip)
+ input_event.InputEventHandler(None, descrip)
if keyBinds.hasKeyBinding(keyBind,
typeOfSearch="description"):
treeModel.set_value(iterChild, MODIF, True)
@@ -3218,10 +3218,10 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
if self.defaultVoice != None:
self.prefsDict["voices"] = {
- settings.DEFAULT_VOICE : acss.ACSS(self.defaultVoice),
- settings.UPPERCASE_VOICE : acss.ACSS(self.uppercaseVoice),
- settings.HYPERLINK_VOICE : acss.ACSS(self.hyperlinkVoice),
- settings.SYSTEM_VOICE : acss.ACSS(self.systemVoice),
+ settings.DEFAULT_VOICE: acss.ACSS(self.defaultVoice),
+ settings.UPPERCASE_VOICE: acss.ACSS(self.uppercaseVoice),
+ settings.HYPERLINK_VOICE: acss.ACSS(self.hyperlinkVoice),
+ settings.SYSTEM_VOICE: acss.ACSS(self.systemVoice),
}
def applyButtonClicked(self, widget):
@@ -3334,7 +3334,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
if not profileToSaveLabel:
return
- profileToSave = profileToSaveLabel.replace(' ','_').lower()
+ profileToSave = profileToSaveLabel.replace(' ', '_').lower()
profile = [profileToSaveLabel, profileToSave]
def saveActiveProfile(newProfile = True):
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 54dfc1b..ebf413f 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -456,7 +456,7 @@ class Utilities:
try:
return self._script.generatorCache[self.DISPLAYED_LABEL][obj]
except:
- if not self._script.generatorCache.has_key(self.DISPLAYED_LABEL):
+ if self.DISPLAYED_LABEL not in self._script.generatorCache:
self._script.generatorCache[self.DISPLAYED_LABEL] = {}
labelString = None
@@ -557,7 +557,7 @@ class Utilities:
if role == pyatspi.ROLE_COMBO_BOX:
displayedText = self._displayedTextInComboBox(obj)
- if not self._script.generatorCache.has_key(self.DISPLAYED_TEXT):
+ if self.DISPLAYED_TEXT not in self._script.generatorCache:
self._script.generatorCache[self.DISPLAYED_TEXT] = {}
self._script.generatorCache[self.DISPLAYED_TEXT][obj] = \
displayedText
@@ -595,7 +595,7 @@ class Utilities:
# general case to handle this stuff and expand objects
# with EMBEDDED_OBJECT_CHARACTERs.]]]
#
- for i in xrange(len(unicodeText)):
+ for i in range(len(unicodeText)):
if unicodeText[i] == self.EMBEDDED_OBJECT_CHARACTER:
displayedText = None
break
@@ -618,7 +618,7 @@ class Utilities:
displayedText = \
self.appendString(displayedText, childText)
- if not self._script.generatorCache.has_key(self.DISPLAYED_TEXT):
+ if self.DISPLAYED_TEXT not in self._script.generatorCache:
self._script.generatorCache[self.DISPLAYED_TEXT] = {}
self._script.generatorCache[self.DISPLAYED_TEXT][obj] = displayedText
@@ -1145,7 +1145,7 @@ class Utilities:
except NotImplementedError:
return -1
- for i in xrange(hypertext.getNLinks()):
+ for i in range(hypertext.getNLinks()):
link = hypertext.getLink(i)
if (characterIndex >= link.startIndex) \
and (characterIndex <= link.endIndex):
@@ -1167,7 +1167,7 @@ class Utilities:
try:
return self._script.generatorCache[self.NESTING_LEVEL][obj]
except:
- if not self._script.generatorCache.has_key(self.NESTING_LEVEL):
+ if self.NESTING_LEVEL not in self._script.generatorCache:
self._script.generatorCache[self.NESTING_LEVEL] = {}
nestingLevel = 0
@@ -1194,7 +1194,7 @@ class Utilities:
try:
return self._script.generatorCache[self.NODE_LEVEL][obj]
except:
- if not self._script.generatorCache.has_key(self.NODE_LEVEL):
+ if self.NODE_LEVEL not in self._script.generatorCache:
self._script.generatorCache[self.NODE_LEVEL] = {}
nodes = []
@@ -1291,8 +1291,8 @@ class Utilities:
return self._script.\
generatorCache[self.REAL_ACTIVE_DESCENDANT][obj]
except:
- if not self._script.\
- generatorCache.has_key(self.REAL_ACTIVE_DESCENDANT):
+ if self.REAL_ACTIVE_DESCENDANT not in self._script.\
+ generatorCache:
self._script.generatorCache[self.REAL_ACTIVE_DESCENDANT] = {}
activeDescendant = None
@@ -1414,7 +1414,7 @@ class Utilities:
currentY = parentExtents.y
while currentY < (parentExtents.y + parentExtents.height):
currentX = parentExtents.x
- minHeight = sys.maxint
+ minHeight = sys.maxsize
index = -1
while currentX < (parentExtents.x + parentExtents.width):
child = \
@@ -1438,7 +1438,7 @@ class Utilities:
currentX += gridSize
else:
currentX = newX
- if minHeight == sys.maxint:
+ if minHeight == sys.maxsize:
minHeight = gridSize
currentY += minHeight
@@ -1718,7 +1718,7 @@ class Utilities:
nSelections = text.getNSelections()
except:
nSelections = 0
- for i in xrange(nSelections):
+ for i in range(nSelections):
rv.append(text.getSelection(i))
return rv
@@ -1767,7 +1767,7 @@ class Utilities:
except:
return
- for i in xrange(text.getNSelections()):
+ for i in range(text.getNSelections()):
text.removeSelection(0)
def expandEOCs(self, obj, startOffset=0, endOffset=-1):
@@ -1798,7 +1798,7 @@ class Utilities:
toBuild = list(unicodeText)
count = toBuild.count(self.EMBEDDED_OBJECT_CHARACTER)
- for i in xrange(count):
+ for i in range(count):
index = toBuild.index(self.EMBEDDED_OBJECT_CHARACTER)
child = obj[i + childOffset]
childText = self.expandEOCs(child)
@@ -1899,7 +1899,7 @@ class Utilities:
except:
return False
- for i in xrange(text.getNSelections()):
+ for i in range(text.getNSelections()):
[startSelOffset, endSelOffset] = text.getSelection(i)
if (startOffset >= startSelOffset) and (endOffset <= endSelOffset):
return True
@@ -2264,7 +2264,7 @@ class Utilities:
try:
if visitedObjs.index(referent):
if self._isInterestingObj(referent):
- print indent, "CYCLE!!!!", `referent`
+ print indent, "CYCLE!!!!", repr(referent)
break
except:
pass
@@ -2847,8 +2847,8 @@ class Utilities:
# Translators: this is the spoken word for the space character
#
sequence += _("space")
- sequence = sequence.replace("<","")
- sequence = sequence.replace(">"," ").strip()
+ sequence = sequence.replace("<", "")
+ sequence = sequence.replace(">", " ").strip()
return keynames.localizeKeySequence(sequence)
@@ -2866,7 +2866,7 @@ class Utilities:
try:
return self._script.generatorCache[self.KEY_BINDING][obj]
except:
- if not self._script.generatorCache.has_key(self.KEY_BINDING):
+ if self.KEY_BINDING not in self._script.generatorCache:
self._script.generatorCache[self.KEY_BINDING] = {}
try:
@@ -2904,7 +2904,7 @@ class Utilities:
fullShortcut = ""
accelerator = ""
- fullShortcut = fullShortcut.replace(":"," ").strip()
+ fullShortcut = fullShortcut.replace(":", " ").strip()
fullShortcut = self.labelFromKeySequence(fullShortcut)
mnemonic = self.labelFromKeySequence(mnemonic)
accelerator = self.labelFromKeySequence(accelerator)
@@ -2912,7 +2912,7 @@ class Utilities:
debug.println(debug.LEVEL_FINEST, "script_utilities.getKeyBinding: " \
+ repr([mnemonic, fullShortcut, accelerator]))
- if not self._script.generatorCache.has_key(self.KEY_BINDING):
+ if self.KEY_BINDING not in self._script.generatorCache:
self._script.generatorCache[self.KEY_BINDING] = {}
self._script.generatorCache[self.KEY_BINDING][obj] = \
diff --git a/src/orca/scripts/apps/ddu/script_utilities.py b/src/orca/scripts/apps/ddu/script_utilities.py
index 6071041..2263119 100644
--- a/src/orca/scripts/apps/ddu/script_utilities.py
+++ b/src/orca/scripts/apps/ddu/script_utilities.py
@@ -95,8 +95,8 @@ class Utilities(script_utilities.Utilities):
return self._script.\
generatorCache[self.REAL_ACTIVE_DESCENDANT][obj]
except:
- if not self._script.\
- generatorCache.has_key(self.REAL_ACTIVE_DESCENDANT):
+ if self.REAL_ACTIVE_DESCENDANT not in self._script.\
+ generatorCache:
self._script.generatorCache[self.REAL_ACTIVE_DESCENDANT] = {}
activeDescendant = None
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index fef8ba8..8997fea 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -788,7 +788,7 @@ class Script(script.Script):
# and exit the "List Shortcuts Mode" by pressing Escape.
#
_("Enters list shortcuts mode. Press escape to exit " \
- "list shortcuts mode."),False)
+ "list shortcuts mode."), False)
# Do not enable learn mode for this action
self.inputEventHandlers["decreaseSpeechRateHandler"] = \
@@ -5235,7 +5235,7 @@ class Script(script.Script):
"""
self.pointOfReference["lastSelections"] = []
- for i in xrange(text.getNSelections()):
+ for i in range(text.getNSelections()):
self.pointOfReference["lastSelections"].append(
text.getSelection(i))
diff --git a/src/orca/scripts/toolkits/Gecko/braille_generator.py b/src/orca/scripts/toolkits/Gecko/braille_generator.py
index bc36f0b..5fab47f 100644
--- a/src/orca/scripts/toolkits/Gecko/braille_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/braille_generator.py
@@ -224,7 +224,7 @@ class BrailleGenerator(braille_generator.BrailleGenerator):
return result
s = obj.querySelection()
- items = [s.getSelectedChild(i) for i in xrange(s.nSelectedChildren)]
+ items = [s.getSelectedChild(i) for i in range(s.nSelectedChildren)]
if not items and obj.childCount:
items.append(obj[0])
items = map(self._generateName, items)
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 6361e37..2d08bb2 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -1061,7 +1061,7 @@ class Script(default.Script):
contents = self.getLineContentsAtOffset(obj, characterOffset)
utterances = self.getUtterancesFromContents(contents)
clumped = self.clumpUtterances(utterances)
- for i in xrange(len(clumped)):
+ for i in range(len(clumped)):
[obj, startOffset, endOffset, text] = \
contents[min(i, len(contents)-1)]
[element, voice] = clumped[i]
@@ -2643,7 +2643,7 @@ class Script(default.Script):
else:
obj = obj.parent
- if not self.generatorCache.has_key('inDocumentContent'):
+ if 'inDocumentContent' not in self.generatorCache:
self.generatorCache['inDocumentContent'] = {}
if obj:
@@ -2871,7 +2871,7 @@ class Script(default.Script):
pass
obj = obj or orca_state.locusOfFocus
attrs = self._getAttrDictionary(obj)
- if not self.generatorCache.has_key('isAria'):
+ if 'isAria' not in self.generatorCache:
self.generatorCache['isAria'] = {}
self.generatorCache['isAria'][obj] = \
('xml-roles' in attrs and 'live' not in attrs)
diff --git a/src/orca/scripts/toolkits/Gecko/script_utilities.py b/src/orca/scripts/toolkits/Gecko/script_utilities.py
index 86691d1..3879898 100644
--- a/src/orca/scripts/toolkits/Gecko/script_utilities.py
+++ b/src/orca/scripts/toolkits/Gecko/script_utilities.py
@@ -482,7 +482,7 @@ class Utilities(script_utilities.Utilities):
# by storing attributes.
#
attrsForObj = self._script.currentAttrs.get(hash(acc)) or {}
- if attrsForObj.has_key(offset):
+ if offset in attrsForObj:
return attrsForObj.get(offset)
attrs = script_utilities.Utilities.textAttributes(
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index 4eae1eb..b73e9ed 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -314,7 +314,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
return result
s = obj.querySelection()
- items = [s.getSelectedChild(i) for i in xrange(s.nSelectedChildren)]
+ items = [s.getSelectedChild(i) for i in range(s.nSelectedChildren)]
if not items and obj.childCount:
items.append(obj[0])
items = map(self._generateName, items)
diff --git a/src/orca/scripts/toolkits/WebKitGtk/script.py b/src/orca/scripts/toolkits/WebKitGtk/script.py
index c0792d5..62baa33 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/script.py
+++ b/src/orca/scripts/toolkits/WebKitGtk/script.py
@@ -482,7 +482,7 @@ class Script(default.Script):
index = -1
text = child.queryText()
- for i in xrange(text.characterCount):
+ for i in range(text.characterCount):
if text.setCaretOffset(i):
index = i
break
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 3026de1..b6c38fe 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -338,10 +338,10 @@ voicesKeys = {
voices = {
- DEFAULT_VOICE : ACSS({}),
- UPPERCASE_VOICE : ACSS({ACSS.AVERAGE_PITCH : 5.6}),
- HYPERLINK_VOICE : ACSS({}),
- SYSTEM_VOICE : ACSS({}),
+ DEFAULT_VOICE: ACSS({}),
+ UPPERCASE_VOICE: ACSS({ACSS.AVERAGE_PITCH : 5.6}),
+ HYPERLINK_VOICE: ACSS({}),
+ SYSTEM_VOICE: ACSS({}),
}
# If True, enable speaking of speech indentation and justification.
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index ad9c6c4..49dd9f1 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -73,12 +73,12 @@ STATE = "state" # Candidate for sound
VALUE = "value" # Candidate for sound
voiceType = {
- DEFAULT : settings.DEFAULT_VOICE,
- UPPERCASE : settings.UPPERCASE_VOICE,
- HYPERLINK : settings.HYPERLINK_VOICE,
- SYSTEM : settings.SYSTEM_VOICE,
- STATE : settings.SYSTEM_VOICE, # Users may prefer DEFAULT_VOICE here
- VALUE : settings.SYSTEM_VOICE, # Users may prefer DEFAULT_VOICE here
+ DEFAULT: settings.DEFAULT_VOICE,
+ UPPERCASE: settings.UPPERCASE_VOICE,
+ HYPERLINK: settings.HYPERLINK_VOICE,
+ SYSTEM: settings.SYSTEM_VOICE,
+ STATE: settings.SYSTEM_VOICE, # Users may prefer DEFAULT_VOICE here
+ VALUE: settings.SYSTEM_VOICE, # Users may prefer DEFAULT_VOICE here
}
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index b3c83dc..9ec4fcf 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -353,7 +353,7 @@ class SpeechServer(speechserver.SpeechServer):
"""
try:
- context, acss = iterator.next()
+ context, acss = next(iterator)
except StopIteration:
pass
else:
diff --git a/src/orca/structural_navigation.py b/src/orca/structural_navigation.py
index d878f36..94ad02d 100644
--- a/src/orca/structural_navigation.py
+++ b/src/orca/structural_navigation.py
@@ -1348,7 +1348,7 @@ class StructuralNavigation:
except:
pass
else:
- for i in xrange(obj.childCount):
+ for i in range(obj.childCount):
[isCell, row, col, rowExtents, colExtents, isSelected] = \
table.getRowColumnExtentsAtIndex(i)
if (rowExtents > 1) or (colExtents > 1):
@@ -1659,7 +1659,7 @@ class StructuralNavigation:
index = self._script.utilities.cellIndex(obj)
row = table.getRowAtIndex(index)
- for col in xrange(table.nColumns):
+ for col in range(table.nColumns):
cell = table.getAccessibleAt(row, col)
if not self._isHeader(cell):
return False
@@ -1683,7 +1683,7 @@ class StructuralNavigation:
index = self._script.utilities.cellIndex(obj)
col = table.getColumnAtIndex(index)
- for row in xrange(table.nRows):
+ for row in range(table.nRows):
cell = table.getAccessibleAt(row, col)
if not self._isHeader(cell):
return False
diff --git a/test/harness/quit.py b/test/harness/quit.py
index e6eb308..7708338 100644
--- a/test/harness/quit.py
+++ b/test/harness/quit.py
@@ -7,10 +7,10 @@ from macaroon.playback import *
sequence = MacroSequence()
-sequence.append(KeyPressAction ( 0, 106,"Insert")) # Press Insert
-sequence.append(KeyPressAction ( 168, 24,"q")) # Press q
-sequence.append(KeyReleaseAction ( 151, 24,"q")) # Release q
-sequence.append(KeyReleaseAction ( 48, 106,"Insert")) # Release Insert
+sequence.append(KeyPressAction ( 0, 106, "Insert")) # Press Insert
+sequence.append(KeyPressAction ( 168, 24, "q")) # Press q
+sequence.append(KeyReleaseAction ( 151, 24, "q")) # Release q
+sequence.append(KeyReleaseAction ( 48, 106, "Insert")) # Release Insert
sequence.append(WaitForFocus("Cancel", acc_role=pyatspi.ROLE_PUSH_BUTTON))
sequence.append(KeyComboAction("<Alt>q"))
diff --git a/test/harness/settings_test.py b/test/harness/settings_test.py
index 662b5f5..0cf3833 100644
--- a/test/harness/settings_test.py
+++ b/test/harness/settings_test.py
@@ -14,16 +14,16 @@ def exerciseBackendAPI(backendName, profile):
# Getters
preferences = settingsManager.getPreferences(profile)
- print 'preferences: \n',preferences,'\n\n'
+ print 'preferences: \n', preferences, '\n\n'
generalSettings = settingsManager.getGeneralSettings(profile)
- print 'generalSettings: \n',generalSettings,'\n\n'
+ print 'generalSettings: \n', generalSettings, '\n\n'
pronunciations = settingsManager.getPronunciations(profile)
- print 'pronunciations: \n',pronunciations,'\n\n'
+ print 'pronunciations: \n', pronunciations, '\n\n'
keybindings = settingsManager.getKeybindings(profile)
- print 'keybindings: \n',keybindings,'\n\n'
+ print 'keybindings: \n', keybindings, '\n\n'
# Adding new settings to the profile and merging them
newGeneralSettings = getSettingsFromFile('general')
diff --git a/test/keystrokes/firefox/orca_bookmarks.py b/test/keystrokes/firefox/orca_bookmarks.py
index 2ae71a0..e9a0bdd 100644
--- a/test/keystrokes/firefox/orca_bookmarks.py
+++ b/test/keystrokes/firefox/orca_bookmarks.py
@@ -41,11 +41,11 @@ sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_ENTRY))
# SPEECH OUTPUT: 'entered bookmark'
# SPEECH OUTPUT: 'Type something here: text '
#
-sequence.append(KeyPressAction (0, None,"Alt_L"))
-sequence.append(KeyPressAction (0, None,"Insert"))
+sequence.append(KeyPressAction (0, None, "Alt_L"))
+sequence.append(KeyPressAction (0, None, "Insert"))
sequence.append(TypeAction ("1"))
-sequence.append(KeyReleaseAction(150, None,"Insert"))
-sequence.append(KeyReleaseAction(150, None,"Alt_L"))
+sequence.append(KeyReleaseAction(150, None, "Insert"))
+sequence.append(KeyReleaseAction(150, None, "Alt_L"))
########################################################################
# Tab to the first checkbox. Irrelevant output ignored.
@@ -65,11 +65,11 @@ sequence.append(WaitForFocus("Red", acc_role=pyatspi.ROLE_CHECK_BOX))
# SPEECH OUTPUT: 'entered bookmark'
# SPEECH OUTPUT: 'Red check box not checked'
#
-sequence.append(KeyPressAction (0, None,"Alt_L"))
-sequence.append(KeyPressAction (0, None,"Insert"))
+sequence.append(KeyPressAction (0, None, "Alt_L"))
+sequence.append(KeyPressAction (0, None, "Insert"))
sequence.append(TypeAction ("2"))
-sequence.append(KeyReleaseAction(150, None,"Insert"))
-sequence.append(KeyReleaseAction(150, None,"Alt_L"))
+sequence.append(KeyReleaseAction(150, None, "Insert"))
+sequence.append(KeyReleaseAction(150, None, "Alt_L"))
########################################################################
# Go to bookmark number 1. The following will be presented.
diff --git a/test/keystrokes/firefox/xul_role_check_box.py b/test/keystrokes/firefox/xul_role_check_box.py
index f3816c3..712a5d8 100755
--- a/test/keystrokes/firefox/xul_role_check_box.py
+++ b/test/keystrokes/firefox/xul_role_check_box.py
@@ -20,7 +20,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Alt>f"))
sequence.append(KeyComboAction("p"))
-sequence.append(WaitForWindowActivate("Print",None))
+sequence.append(WaitForWindowActivate("Print", None))
sequence.append(PauseAction(3000))
########################################################################
diff --git a/test/keystrokes/firefox/xul_role_combo_box.py b/test/keystrokes/firefox/xul_role_combo_box.py
index c47890e..35c7e4c 100644
--- a/test/keystrokes/firefox/xul_role_combo_box.py
+++ b/test/keystrokes/firefox/xul_role_combo_box.py
@@ -20,7 +20,7 @@ sequence.append(KeyComboAction("<Alt>e"))
sequence.append(PauseAction(3000))
sequence.append(KeyComboAction("Up"))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("",None))
+sequence.append(WaitForWindowActivate("", None))
sequence.append(PauseAction(3000))
diff --git a/test/keystrokes/firefox/xul_role_entry.py b/test/keystrokes/firefox/xul_role_entry.py
index bd57d1e..e4566c9 100644
--- a/test/keystrokes/firefox/xul_role_entry.py
+++ b/test/keystrokes/firefox/xul_role_entry.py
@@ -341,7 +341,7 @@ sequence.append(KeyComboAction("<Alt>F4"))
########################################################################
# Wait for the focus to be back on the blank Firefox window.
#
-sequence.append(WaitForWindowActivate("",None))
+sequence.append(WaitForWindowActivate("", None))
# Just a little extra wait to let some events get through.
#
diff --git a/test/keystrokes/firefox/xul_role_list_item.py b/test/keystrokes/firefox/xul_role_list_item.py
index 80768f7..e79d6c0 100755
--- a/test/keystrokes/firefox/xul_role_list_item.py
+++ b/test/keystrokes/firefox/xul_role_list_item.py
@@ -20,7 +20,7 @@ sequence.append(KeyComboAction("<Alt>e"))
sequence.append(PauseAction(3000))
sequence.append(KeyComboAction("Up"))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("",None))
+sequence.append(WaitForWindowActivate("", None))
sequence.append(PauseAction(3000))
########################################################################
diff --git a/test/keystrokes/firefox/xul_role_page_tab.py b/test/keystrokes/firefox/xul_role_page_tab.py
index cf43447..972d94c 100755
--- a/test/keystrokes/firefox/xul_role_page_tab.py
+++ b/test/keystrokes/firefox/xul_role_page_tab.py
@@ -20,7 +20,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Alt>f"))
sequence.append(KeyComboAction("p"))
-sequence.append(WaitForWindowActivate("Print",None))
+sequence.append(WaitForWindowActivate("Print", None))
sequence.append(PauseAction(3000))
########################################################################
diff --git a/test/keystrokes/firefox/xul_role_push_button.py b/test/keystrokes/firefox/xul_role_push_button.py
index 7fde1d4..860fd64 100755
--- a/test/keystrokes/firefox/xul_role_push_button.py
+++ b/test/keystrokes/firefox/xul_role_push_button.py
@@ -51,7 +51,7 @@ sequence.append(utils.AssertPresentationAction(
# to regain focus.
#
sequence.append(TypeAction("Escape"))
-sequence.append(WaitForWindowActivate("",None))
+sequence.append(WaitForWindowActivate("", None))
# Just a little extra wait to let some events get through.
#
diff --git a/test/keystrokes/firefox/xul_role_tree.py b/test/keystrokes/firefox/xul_role_tree.py
index d3a36d7..b1a2ce9 100644
--- a/test/keystrokes/firefox/xul_role_tree.py
+++ b/test/keystrokes/firefox/xul_role_tree.py
@@ -190,7 +190,7 @@ sequence.append(KeyComboAction("<Alt>F4"))
########################################################################
# Wait for the focus to be back on the blank Firefox window.
#
-sequence.append(WaitForWindowActivate("",None))
+sequence.append(WaitForWindowActivate("", None))
# Just a little extra wait to let some events get through.
#
diff --git a/test/keystrokes/firefox/xul_role_tree_table.py b/test/keystrokes/firefox/xul_role_tree_table.py
index a6692d3..f2e59c9 100644
--- a/test/keystrokes/firefox/xul_role_tree_table.py
+++ b/test/keystrokes/firefox/xul_role_tree_table.py
@@ -83,7 +83,7 @@ sequence.append(KeyComboAction("<Alt>F4"))
########################################################################
# Wait for the focus to be back on the blank Firefox window.
#
-sequence.append(WaitForWindowActivate("",None))
+sequence.append(WaitForWindowActivate("", None))
# Just a little extra wait to let some events get through.
#
diff --git a/test/keystrokes/gcalctool/gcalctool01.py b/test/keystrokes/gcalctool/gcalctool01.py
index 74c322d..00d7192 100644
--- a/test/keystrokes/gcalctool/gcalctool01.py
+++ b/test/keystrokes/gcalctool/gcalctool01.py
@@ -8,7 +8,7 @@ sequence = MacroSequence()
###############################################################################
# Use the 'Advanced' mode...
#
-sequence.append(WaitForWindowActivate("Calculator",None))
+sequence.append(WaitForWindowActivate("Calculator", None))
sequence.append(KeyComboAction("<Control>a"))
sequence.append(WaitForFocus("Change Mode", acc_role=pyatspi.ROLE_PUSH_BUTTON))
sequence.append(KeyComboAction("Return"))
@@ -16,7 +16,7 @@ sequence.append(KeyComboAction("Return"))
###############################################################################
# Input the number 144 and find its square root.
#
-sequence.append(WaitForWindowActivate("Calculator - Advanced",None))
+sequence.append(WaitForWindowActivate("Calculator - Advanced", None))
sequence.append(TypeAction("s144)"))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
diff --git a/test/keystrokes/gtk-demo/role_table.py b/test/keystrokes/gtk-demo/role_table.py
index 1541221..8f003b2 100644
--- a/test/keystrokes/gtk-demo/role_table.py
+++ b/test/keystrokes/gtk-demo/role_table.py
@@ -79,9 +79,9 @@ sequence.append(utils.AssertPresentationAction(
# Turn reading of rows off.
#
sequence.append(utils.StartRecordingAction())
-sequence.append(KeyPressAction(0, None,"KP_Insert"))
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
sequence.append(KeyComboAction("F11"))
-sequence.append(KeyReleaseAction(0, None,"KP_Insert"))
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
sequence.append(utils.AssertPresentationAction(
"Turn row reading off",
["BRAILLE LINE: 'Speak cell'",
diff --git a/test/keystrokes/java/role_check_box.py b/test/keystrokes/java/role_check_box.py
index 03a3074..81dffe1 100644
--- a/test/keystrokes/java/role_check_box.py
+++ b/test/keystrokes/java/role_check_box.py
@@ -99,7 +99,7 @@ sequence.append(utils.AssertPresentationAction(
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction(' '))
sequence.append(WaitAction("object:state-changed:checked", None,
- None, pyatspi.ROLE_CHECK_BOX,5000))
+ None, pyatspi.ROLE_CHECK_BOX, 5000))
sequence.append(utils.AssertPresentationAction(
"One checkbox checked",
["BRAILLE LINE: 'SwingSet2 Application SwingSet2 Frame RootPane LayeredPane Button Demo TabList Button Demo Page Check Boxes TabList Check Boxes Page Text CheckBoxes Panel <x> One CheckBox'",
diff --git a/test/keystrokes/oobase/bug_463172.py b/test/keystrokes/oobase/bug_463172.py
index 1ff55d7..20113cb 100644
--- a/test/keystrokes/oobase/bug_463172.py
+++ b/test/keystrokes/oobase/bug_463172.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
# 1. Start oobase. Wait for the first screen of the startup wizard to
# appear.
#
-sequence.append(WaitForWindowActivate("Database Wizard",None))
+sequence.append(WaitForWindowActivate("Database Wizard", None))
sequence.append(WaitForFocus("Select database", acc_role=pyatspi.ROLE_LABEL))
######################################################################
@@ -73,7 +73,7 @@ sequence.append(PauseAction(3000))
# SPEECH OUTPUT: 'Forms label'
#
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("New Database - OpenOffice.org Base",None))
+sequence.append(WaitForWindowActivate("New Database - OpenOffice.org Base", None))
sequence.append(WaitForFocus("IconChoiceControl", acc_role=pyatspi.ROLE_TREE))
######################################################################
diff --git a/test/keystrokes/oobase/bug_465109.py b/test/keystrokes/oobase/bug_465109.py
index a7c65fa..a58a0da 100644
--- a/test/keystrokes/oobase/bug_465109.py
+++ b/test/keystrokes/oobase/bug_465109.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
# 1. Start oobase. There is a bug_465109.params file that will
# automatically load bug_465109.odb.
#
-sequence.append(WaitForWindowActivate("bug_465109 - OpenOffice.org Base",None))
+sequence.append(WaitForWindowActivate("bug_465109 - OpenOffice.org Base", None))
######################################################################
# 2. Enter Alt-v, right arrow and Return to select Tables from the
@@ -58,7 +58,7 @@ sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_TREE))
#
sequence.append(KeyComboAction("Down"))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("bug_465109: NameAddrPhone",None))
+sequence.append(WaitForWindowActivate("bug_465109: NameAddrPhone", None))
sequence.append(WaitForFocus("Data source table view", acc_role=pyatspi.ROLE_PANEL))
######################################################################
diff --git a/test/keystrokes/ooimpress/bug_462239.py b/test/keystrokes/ooimpress/bug_462239.py
index c20f8da..1d41e4f 100644
--- a/test/keystrokes/ooimpress/bug_462239.py
+++ b/test/keystrokes/ooimpress/bug_462239.py
@@ -19,7 +19,7 @@ sequence = MacroSequence()
# SPEECH OUTPUT: 'root pane'
# SPEECH OUTPUT: 'scroll pane'
#
-sequence.append(WaitForWindowActivate("subtlewaves - OpenOffice.org Impress",None))
+sequence.append(WaitForWindowActivate("subtlewaves - OpenOffice.org Impress", None))
######################################################################
# 2. Enter Alt-f, Alt-c to close the presentation window.
diff --git a/test/keystrokes/ooimpress/bug_462256.py b/test/keystrokes/ooimpress/bug_462256.py
index 4601fbd..9f77eda 100644
--- a/test/keystrokes/ooimpress/bug_462256.py
+++ b/test/keystrokes/ooimpress/bug_462256.py
@@ -18,7 +18,7 @@ sequence = MacroSequence()
# SPEECH OUTPUT: 'Presentation Wizard'
# SPEECH OUTPUT: 'Next >> button'
#
-sequence.append(WaitForWindowActivate("Presentation Wizard",None))
+sequence.append(WaitForWindowActivate("Presentation Wizard", None))
sequence.append(WaitForFocus("Next", acc_role=pyatspi.ROLE_PUSH_BUTTON))
######################################################################
@@ -51,7 +51,7 @@ sequence.append(WaitForFocus("Create", acc_role=pyatspi.ROLE_PUSH_BUTTON))
# SPEECH OUTPUT: 'scroll pane'
#
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Impress",None))
+sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Impress", None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_SCROLL_PANE))
######################################################################
diff --git a/test/keystrokes/ooimpress/bug_462547.py b/test/keystrokes/ooimpress/bug_462547.py
index 3da5e9d..b559b29 100644
--- a/test/keystrokes/ooimpress/bug_462547.py
+++ b/test/keystrokes/ooimpress/bug_462547.py
@@ -17,7 +17,7 @@ sequence = MacroSequence()
# SPEECH OUTPUT: 'Presentation Wizard'
# SPEECH OUTPUT: 'Next >> button'
#
-sequence.append(WaitForWindowActivate("Presentation Wizard",None))
+sequence.append(WaitForWindowActivate("Presentation Wizard", None))
sequence.append(WaitForFocus("Next", acc_role=pyatspi.ROLE_PUSH_BUTTON))
######################################################################
@@ -50,7 +50,7 @@ sequence.append(WaitForFocus("Create", acc_role=pyatspi.ROLE_PUSH_BUTTON))
# SPEECH OUTPUT: 'scroll pane'
#
sequence.append(KeyComboAction("space"))
-sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Impress",None))
+sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Impress", None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_SCROLL_PANE))
######################################################################
diff --git a/test/keystrokes/ooimpress/bug_465449.py b/test/keystrokes/ooimpress/bug_465449.py
index bf3ad90..5088b6d 100644
--- a/test/keystrokes/ooimpress/bug_465449.py
+++ b/test/keystrokes/ooimpress/bug_465449.py
@@ -18,7 +18,7 @@ sequence = MacroSequence()
# SPEECH OUTPUT: 'root pane'
# SPEECH OUTPUT: 'scroll pane'
#
-sequence.append(WaitForWindowActivate("subtlewaves - OpenOffice.org Impress",None))
+sequence.append(WaitForWindowActivate("subtlewaves - OpenOffice.org Impress", None))
######################################################################
# 2. Enter Alt-v, down arrow and Return to change to an Outline view.
diff --git a/test/keystrokes/oowriter/bug_353268.py b/test/keystrokes/oowriter/bug_353268.py
index 8d46f05..b96ea95 100644
--- a/test/keystrokes/oowriter/bug_353268.py
+++ b/test/keystrokes/oowriter/bug_353268.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_355733.py b/test/keystrokes/oowriter/bug_355733.py
index 052c4b9..e81a3cd 100644
--- a/test/keystrokes/oowriter/bug_355733.py
+++ b/test/keystrokes/oowriter/bug_355733.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -25,7 +25,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_361624.py b/test/keystrokes/oowriter/bug_361624.py
index 1f31db2..da5ed65 100644
--- a/test/keystrokes/oowriter/bug_361624.py
+++ b/test/keystrokes/oowriter/bug_361624.py
@@ -14,7 +14,7 @@ sequence = MacroSequence()
# 1. Start oowriter. There is a bug_361624.params file that will
# automatically load column-example.odt.
#
-sequence.append(WaitForWindowActivate("column-example " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("column-example " + utils.getOOoName("Writer"), None))
######################################################################
# 2. Type Control-Home to position the text caret to the left of the
diff --git a/test/keystrokes/oowriter/bug_361747.py b/test/keystrokes/oowriter/bug_361747.py
index e35258d..6dc9797 100644
--- a/test/keystrokes/oowriter/bug_361747.py
+++ b/test/keystrokes/oowriter/bug_361747.py
@@ -14,7 +14,7 @@ import utils
# automatically load empty_document.odt. This uses the FreeSerif
# font as the default which should be available on all test systems.
#
-sequence.append(WaitForWindowActivate("empty_document(.odt|) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("empty_document(.odt|) - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_362979.py b/test/keystrokes/oowriter/bug_362979.py
index 181e183..a44d6a3 100644
--- a/test/keystrokes/oowriter/bug_362979.py
+++ b/test/keystrokes/oowriter/bug_362979.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_364765.py b/test/keystrokes/oowriter/bug_364765.py
index 41e5855..3f1b6d3 100644
--- a/test/keystrokes/oowriter/bug_364765.py
+++ b/test/keystrokes/oowriter/bug_364765.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_382408.py b/test/keystrokes/oowriter/bug_382408.py
index fa89803..3f1ee2b 100644
--- a/test/keystrokes/oowriter/bug_382408.py
+++ b/test/keystrokes/oowriter/bug_382408.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
# 1. Start oowriter. There is a bug_382408.params file that will
# automatically load table-sample.odt
#
-sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"), None))
######################################################################
# 2. Type Control-Home to move the text caret to the start of the document.
diff --git a/test/keystrokes/oowriter/bug_382415.py b/test/keystrokes/oowriter/bug_382415.py
index 21da55f..0912792 100644
--- a/test/keystrokes/oowriter/bug_382415.py
+++ b/test/keystrokes/oowriter/bug_382415.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
# 1. Start oowriter. There is a bug_382415.params file that will
# automatically load table-sample.odt
#
-sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"), None))
######################################################################
# 2. Type Control-Home to move the text caret to the start of the document.
diff --git a/test/keystrokes/oowriter/bug_382418.py b/test/keystrokes/oowriter/bug_382418.py
index 71ee30b..0616080 100644
--- a/test/keystrokes/oowriter/bug_382418.py
+++ b/test/keystrokes/oowriter/bug_382418.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -25,7 +25,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_382880.py b/test/keystrokes/oowriter/bug_382880.py
index c572aea..7a2bb56 100644
--- a/test/keystrokes/oowriter/bug_382880.py
+++ b/test/keystrokes/oowriter/bug_382880.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
# 1. Start oowriter. There is a bug_382880.params file that will
# automatically load table-sample.odt
#
-sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"), None))
######################################################################
# 2. Type Control-Home to move the text caret to the start of the document.
diff --git a/test/keystrokes/oowriter/bug_382888.py b/test/keystrokes/oowriter/bug_382888.py
index 9caf924..fb74318 100644
--- a/test/keystrokes/oowriter/bug_382888.py
+++ b/test/keystrokes/oowriter/bug_382888.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
# 1. Start oowriter. There is a bug_382888.params file that will
# automatically load table-sample.odt
#
-sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"), None))
######################################################################
# 2. Type Control-Home to move the text caret to the start of the document.
diff --git a/test/keystrokes/oowriter/bug_384893.py b/test/keystrokes/oowriter/bug_384893.py
index 281e318..ab2a021 100644
--- a/test/keystrokes/oowriter/bug_384893.py
+++ b/test/keystrokes/oowriter/bug_384893.py
@@ -15,7 +15,7 @@ sequence = MacroSequence()
# automatically load empty_document.odt. This uses the FreeSerif
# font as the default which should be available on all test systems.
#
-sequence.append(WaitForWindowActivate("empty_document(.odt|) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("empty_document(.odt|) - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_385828.py b/test/keystrokes/oowriter/bug_385828.py
index 6a0dcb2..3146609 100644
--- a/test/keystrokes/oowriter/bug_385828.py
+++ b/test/keystrokes/oowriter/bug_385828.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -32,7 +32,7 @@ sequence.append(WaitForFocus("Letter...", acc_role=pyatspi.ROLE_MENU_ITEM))
#
sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction("a"))
-sequence.append(WaitForWindowActivate("aw-5blue (read-only) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("aw-5blue (read-only) - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("Page design", acc_role=pyatspi.ROLE_LABEL))
sequence.append(utils.AssertPresentationAction(
"Press 'a' to bring up the Agenda... wizard",
diff --git a/test/keystrokes/oowriter/bug_413909.py b/test/keystrokes/oowriter/bug_413909.py
index 5fb8573..b1f2988 100644
--- a/test/keystrokes/oowriter/bug_413909.py
+++ b/test/keystrokes/oowriter/bug_413909.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -26,7 +26,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_430402.py b/test/keystrokes/oowriter/bug_430402.py
index c49546e..9bd09b2 100644
--- a/test/keystrokes/oowriter/bug_430402.py
+++ b/test/keystrokes/oowriter/bug_430402.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -26,7 +26,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_435201.py b/test/keystrokes/oowriter/bug_435201.py
index cd6c062..5999ab3 100644
--- a/test/keystrokes/oowriter/bug_435201.py
+++ b/test/keystrokes/oowriter/bug_435201.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
# 1. Start oowriter. There is a bug_435201.params file that will
# automatically load spanish.odt
#
-sequence.append(WaitForWindowActivate("spanish - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("spanish - " + utils.getOOoName("Writer"), None))
######################################################################
# 2. Type Control-Home to position the text caret to the left of the
diff --git a/test/keystrokes/oowriter/bug_435226.py b/test/keystrokes/oowriter/bug_435226.py
index 66fce78..729f1f3 100644
--- a/test/keystrokes/oowriter/bug_435226.py
+++ b/test/keystrokes/oowriter/bug_435226.py
@@ -18,7 +18,7 @@ sequence = MacroSequence()
# 1. Start oowriter. There is a bug_435226.params file that will
# automatically load spanish.odt.
#
-sequence.append(WaitForWindowActivate("spanish(.odt|) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("spanish(.odt|) - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_450210.py b/test/keystrokes/oowriter/bug_450210.py
index 5ad29e0..f6e4203 100644
--- a/test/keystrokes/oowriter/bug_450210.py
+++ b/test/keystrokes/oowriter/bug_450210.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_546941.py b/test/keystrokes/oowriter/bug_546941.py
index 4bbeb8e..0aeacb4 100644
--- a/test/keystrokes/oowriter/bug_546941.py
+++ b/test/keystrokes/oowriter/bug_546941.py
@@ -14,7 +14,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/row_inserted.py b/test/keystrokes/oowriter/row_inserted.py
index 23372ca..46140da 100644
--- a/test/keystrokes/oowriter/row_inserted.py
+++ b/test/keystrokes/oowriter/row_inserted.py
@@ -11,7 +11,7 @@ sequence = MacroSequence()
######################################################################
# Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/table_cells.py b/test/keystrokes/oowriter/table_cells.py
index 9fd15f9..079520f 100644
--- a/test/keystrokes/oowriter/table_cells.py
+++ b/test/keystrokes/oowriter/table_cells.py
@@ -11,7 +11,7 @@ sequence = MacroSequence()
# Start oowriter. There is a table_cells.params file that will
# automatically load table-sample.odt
#
-sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"), None))
######################################################################
# Type Control-Home to move the text caret to the start of the document.
diff --git a/test/keystrokes/oowriter/table_cells_structural_navigation1.py b/test/keystrokes/oowriter/table_cells_structural_navigation1.py
index 0ba08c0..95a8227 100644
--- a/test/keystrokes/oowriter/table_cells_structural_navigation1.py
+++ b/test/keystrokes/oowriter/table_cells_structural_navigation1.py
@@ -11,7 +11,7 @@ sequence = MacroSequence()
# Start oowriter. There is a table_cells.params file that will
# automatically load table-sample.odt
#
-sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("table-sample(.odt|) - " + utils.getOOoName("Writer"), None))
######################################################################
# Type Control-Home to move the text caret to the start of the document.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
