[orca] More work on the Python 3 migration
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] More work on the Python 3 migration
- Date: Fri, 11 May 2012 02:13:40 +0000 (UTC)
commit 17033c32d34d8b7376aae009a40ffd3bb12995e4
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Thu May 10 20:34:05 2012 -0400
More work on the Python 3 migration
src/orca/app_gui_prefs.py | 26 ++++++------
src/orca/app_prefs.py | 6 +-
src/orca/bookmarks.py | 9 ++--
src/orca/braille.py | 14 +++---
src/orca/braille_generator.py | 16 ++++----
src/orca/braille_rolenames.py | 4 +-
src/orca/brlmon.py | 4 +-
src/orca/chat.py | 17 ++++----
src/orca/chnames.py | 2 +-
src/orca/common_keyboardmap.py | 2 +-
src/orca/debug.py | 2 +-
src/orca/desktop_keyboardmap.py | 2 +-
src/orca/event_manager.py | 19 +++++----
src/orca/eventsynthesizer.py | 2 +-
src/orca/find.py | 8 ++--
src/orca/flat_review.py | 18 ++++----
src/orca/formatting.py | 4 +-
src/orca/generator.py | 8 ++--
src/orca/input_event.py | 10 ++--
src/orca/keybindings.py | 6 +-
src/orca/keynames.py | 6 +-
src/orca/label_inference.py | 2 +-
src/orca/laptop_keyboardmap.py | 2 +-
src/orca/liveregions.py | 10 ++--
src/orca/logger.py | 6 +-
src/orca/mouse_review.py | 10 ++--
src/orca/notification_messages.py | 14 +++---
src/orca/orca.py | 30 +++++++-------
src/orca/orca_console_prefs.py | 13 +++---
src/orca/orca_gtkbuilder.py | 2 +-
src/orca/orca_gui_find.py | 10 ++--
src/orca/orca_gui_main.py | 8 ++--
src/orca/orca_gui_prefs.py | 40 ++++++++++----------
src/orca/orca_gui_profile.py | 4 +-
src/orca/orca_gui_quit.py | 8 ++--
src/orca/orca_gui_splash.py | 8 ++--
src/orca/outline.py | 4 +-
src/orca/phonnames.py | 2 +-
src/orca/punctuation_settings.py | 2 +-
src/orca/script.py | 32 ++++++++--------
src/orca/script_manager.py | 11 +++--
src/orca/script_utilities.py | 24 ++++++------
src/orca/scripts/apps/Banshee/__init__.py | 2 +-
src/orca/scripts/apps/Banshee/script.py | 6 +-
src/orca/scripts/apps/Eclipse/__init__.py | 2 +-
src/orca/scripts/apps/Eclipse/script.py | 2 +-
src/orca/scripts/apps/Instantbird/__init__.py | 2 +-
src/orca/scripts/apps/Instantbird/script.py | 4 +-
src/orca/scripts/apps/Mozilla/__init__.py | 2 +-
src/orca/scripts/apps/Thunderbird/__init__.py | 2 +-
src/orca/scripts/apps/Thunderbird/script.py | 8 ++--
src/orca/scripts/apps/acroread/__init__.py | 2 +-
src/orca/scripts/apps/ddu/__init__.py | 2 +-
src/orca/scripts/apps/ddu/script.py | 2 +-
src/orca/scripts/apps/ekiga/__init__.py | 2 +-
src/orca/scripts/apps/empathy/__init__.py | 2 +-
src/orca/scripts/apps/empathy/script.py | 2 +-
src/orca/scripts/apps/evolution/__init__.py | 2 +-
src/orca/scripts/apps/evolution/script.py | 6 +-
src/orca/scripts/apps/gajim/__init__.py | 2 +-
src/orca/scripts/apps/gcalctool/__init__.py | 2 +-
src/orca/scripts/apps/gcalctool/script.py | 2 +-
.../scripts/apps/gdm-simple-greeter/__init__.py | 2 +-
src/orca/scripts/apps/gdmlogin/__init__.py | 2 +-
src/orca/scripts/apps/gedit/__init__.py | 2 +-
.../scripts/apps/gnome-keyring-ask/__init__.py | 2 +-
src/orca/scripts/apps/gnome-mud/__init__.py | 2 +-
src/orca/scripts/apps/gnome-panel/__init__.py | 2 +-
src/orca/scripts/apps/gnome-panel/script.py | 2 +-
.../apps/gnome-screensaver-dialog/__init__.py | 2 +-
.../scripts/apps/gnome-search-tool/__init__.py | 2 +-
.../scripts/apps/gnome-system-monitor/__init__.py | 2 +-
src/orca/scripts/apps/gnome-terminal/__init__.py | 2 +-
.../apps/gnome-window-properties/__init__.py | 2 +-
.../scripts/apps/gnome-window-properties/script.py | 2 +-
src/orca/scripts/apps/gnome_segv2/__init__.py | 2 +-
.../scripts/apps/gtk-window-decorator/__init__.py | 2 +-
src/orca/scripts/apps/liferea/__init__.py | 2 +-
src/orca/scripts/apps/metacity/__init__.py | 2 +-
src/orca/scripts/apps/nautilus/__init__.py | 2 +-
.../scripts/apps/notification-daemon/__init__.py | 2 +-
src/orca/scripts/apps/notify-osd/__init__.py | 2 +-
src/orca/scripts/apps/packagemanager/__init__.py | 2 +-
src/orca/scripts/apps/packagemanager/script.py | 10 ++--
src/orca/scripts/apps/pidgin/__init__.py | 2 +-
src/orca/scripts/apps/pidgin/script.py | 6 +-
src/orca/scripts/apps/planner/__init__.py | 2 +-
src/orca/scripts/apps/planner/script.py | 4 +-
src/orca/scripts/apps/rhythmbox/__init__.py | 2 +-
src/orca/scripts/apps/rhythmbox/script.py | 6 +-
src/orca/scripts/apps/soffice/__init__.py | 4 +-
src/orca/scripts/apps/soffice/script.py | 12 +++---
src/orca/scripts/apps/soffice/speech_generator.py | 2 +-
src/orca/scripts/apps/xfwm4/__init__.py | 2 +-
src/orca/scripts/default.py | 2 +-
src/orca/scripts/toolkits/CALLY/__init__.py | 2 +-
src/orca/scripts/toolkits/Gecko/__init__.py | 10 ++--
src/orca/scripts/toolkits/Gecko/bookmarks.py | 2 +-
src/orca/scripts/toolkits/Gecko/script.py | 16 ++++----
.../toolkits/J2SE-access-bridge/__init__.py | 4 +-
.../scripts/toolkits/J2SE-access-bridge/script.py | 6 +-
src/orca/scripts/toolkits/WebKitGtk/__init__.py | 2 +-
src/orca/scripts/toolkits/WebKitGtk/script.py | 10 ++--
src/orca/settings.py | 8 ++--
src/orca/settings_manager.py | 10 ++--
src/orca/speech.py | 16 ++++----
src/orca/speech_generator.py | 19 +++++----
src/orca/speechdispatcherfactory.py | 16 ++++----
src/orca/speechserver.py | 8 ++--
src/orca/structural_navigation.py | 20 +++++-----
src/orca/text_attribute_names.py | 4 +-
src/orca/tutorialgenerator.py | 6 +-
src/orca/where_am_I.py | 4 +-
113 files changed, 374 insertions(+), 368 deletions(-)
---
diff --git a/src/orca/app_gui_prefs.py b/src/orca/app_gui_prefs.py
index 4a93aa3..880a5e6 100644
--- a/src/orca/app_gui_prefs.py
+++ b/src/orca/app_gui_prefs.py
@@ -30,19 +30,19 @@ import locale
import os
import sys
-import app_prefs
-import braille
-import debug
-import input_event
-import keybindings
-import orca
-import orca_gui_prefs
-import orca_state
-import orca_platform
-import settings
-import speech
-
-from orca_i18n import _ # for gettext support
+from . import app_prefs
+from . import braille
+from . import debug
+from . import input_event
+from . import keybindings
+from . import orca
+from . import orca_gui_prefs
+from . import orca_state
+from . import orca_platform
+from . import settings
+from . import speech
+
+from .orca_i18n import _
_scriptManager = getattr(orca, '_scriptManager')
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/app_prefs.py b/src/orca/app_prefs.py
index 71aa318..32793cb 100644
--- a/src/orca/app_prefs.py
+++ b/src/orca/app_prefs.py
@@ -30,9 +30,9 @@ __license__ = "LGPL"
import os
import pprint
-import debug
-import orca
-import settings
+import orca # Deal with this during final Python 3 conversion
+from . import debug
+from . import settings
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/bookmarks.py b/src/orca/bookmarks.py
index 8a1297f..9c0ffca 100644
--- a/src/orca/bookmarks.py
+++ b/src/orca/bookmarks.py
@@ -22,11 +22,12 @@
import pickle
import os
-import orca
-import speech
-import orca_state
+import orca # Deal with this during final Python 3 conversion
-from orca_i18n import _
+from . import speech
+from . import orca_state
+
+from .orca_i18n import _
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/braille.py b/src/orca/braille.py
index d77341e..91bfc8f 100644
--- a/src/orca/braille.py
+++ b/src/orca/braille.py
@@ -56,7 +56,7 @@ except:
_brlAPIAvailable = False
_brlAPIRunning = False
-import settings
+from . import settings
try:
# This can fail due to gtk not being available. We want to
@@ -64,13 +64,13 @@ try:
# for this is to allow "orca --text-setup" to work even if
# the desktop is not running.
#
- import brlmon
+ from . import brlmon
except:
settings.enableBrailleMonitor = False
-import debug
-import eventsynthesizer
-import orca_state
+from . import debug
+from . import eventsynthesizer
+from . import orca_state
# Right now, the orca autogen.sh/configure needs a priori knowledge of
# where the liblouis tables are. When running autogen.sh/configure,
@@ -81,7 +81,7 @@ import orca_state
# liblouis bindings can give us the tablesdir information at runtime
# http://code.google.com/p/liblouis/issues/detail?id=9]]
#
-from orca_platform import tablesdir
+from .orca_platform import tablesdir
if louis and not tablesdir:
debug.println(debug.LEVEL_SEVERE,
"Contraction tables for liblouis cannot be found.")
@@ -93,7 +93,7 @@ if louis and not tablesdir:
"not be available.")
louis = None
-from orca_i18n import _ # for gettext support
+from .orca_i18n import _ # for gettext support
# The braille monitor
#
diff --git a/src/orca/braille_generator.py b/src/orca/braille_generator.py
index 71fe93f..e8e3694 100644
--- a/src/orca/braille_generator.py
+++ b/src/orca/braille_generator.py
@@ -28,14 +28,14 @@ __license__ = "LGPL"
import pyatspi
from gi.repository import Atspi, Atk
-import braille
-import generator
-import orca
-import orca_state
-import settings
-
-from braille_rolenames import shortRoleNames
-from orca_i18n import ngettext # for ngettext support
+import orca # Deal with this during final Python 3 conversion
+from . import braille
+from . import generator
+from . import orca_state
+from . import settings
+
+from .braille_rolenames import shortRoleNames
+from .orca_i18n import ngettext
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/braille_rolenames.py b/src/orca/braille_rolenames.py
index f818c58..878d19b 100644
--- a/src/orca/braille_rolenames.py
+++ b/src/orca/braille_rolenames.py
@@ -27,8 +27,8 @@ __license__ = "LGPL"
import pyatspi
-from orca_i18n import _
-from orca_i18n import C_
+from .orca_i18n import _
+from .orca_i18n import C_
shortRoleNames = {
# Translators: short braille for the rolename of an invalid GUI object.
diff --git a/src/orca/brlmon.py b/src/orca/brlmon.py
index fc3af51..43582bb 100644
--- a/src/orca/brlmon.py
+++ b/src/orca/brlmon.py
@@ -31,8 +31,8 @@ __license__ = "LGPL"
import brlapi
from gi.repository import Gtk
-import orca_state
-from input_event import BrailleEvent
+from . import orca_state
+from .input_event import BrailleEvent
# Attribute/Selection mask strings:
#
diff --git a/src/orca/chat.py b/src/orca/chat.py
index 0a449f8..8337038 100644
--- a/src/orca/chat.py
+++ b/src/orca/chat.py
@@ -27,14 +27,15 @@ __license__ = "LGPL"
import pyatspi
-import input_event
-import keybindings
-import orca
-import orca_state
-import settings
-import speech
-
-from orca_i18n import _
+import orca # Deal with this during final Python 3 conversion
+
+from . import input_event
+from . import keybindings
+from . import orca_state
+from . import settings
+from . import speech
+
+from .orca_i18n import _
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/chnames.py b/src/orca/chnames.py
index 0e9963a..de542d7 100644
--- a/src/orca/chnames.py
+++ b/src/orca/chnames.py
@@ -27,7 +27,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
-from orca_i18n import _ # for gettext support
+from .orca_i18n import _
# chnames is a dictionary where the keys represent a unicode character
# and the values represent the common term used for the character.
diff --git a/src/orca/common_keyboardmap.py b/src/orca/common_keyboardmap.py
index fe02b0f..0cfa43e 100644
--- a/src/orca/common_keyboardmap.py
+++ b/src/orca/common_keyboardmap.py
@@ -28,7 +28,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2010-2011 The Orca Team"
__license__ = "LGPL"
-import settings
+from . import settings
# Storing values
defaultModifierMask = settings.defaultModifierMask
diff --git a/src/orca/debug.py b/src/orca/debug.py
index 49eaa00..38923c3 100644
--- a/src/orca/debug.py
+++ b/src/orca/debug.py
@@ -32,7 +32,7 @@ import traceback
import pyatspi
import sys
-import orca_state
+from . import orca_state
# Used to turn off all debugging.
#
diff --git a/src/orca/desktop_keyboardmap.py b/src/orca/desktop_keyboardmap.py
index 5f765b6..e8a55a4 100644
--- a/src/orca/desktop_keyboardmap.py
+++ b/src/orca/desktop_keyboardmap.py
@@ -28,7 +28,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2010 Joanmarie Diggs, Mesar Hameed."
__license__ = "LGPL"
-import settings
+from . import settings
# Storing values
defaultModifierMask = settings.defaultModifierMask
diff --git a/src/orca/event_manager.py b/src/orca/event_manager.py
index 7ad7b7b..b9dd1cf 100644
--- a/src/orca/event_manager.py
+++ b/src/orca/event_manager.py
@@ -30,15 +30,16 @@ import Queue
import threading
import time
-import braille
-import debug
-import input_event
-import orca
-import orca_state
-import settings
-import speech
-
-from orca_i18n import _
+import orca # Deal with this during final Python 3 conversion
+
+from . import braille
+from . import debug
+from . import input_event
+from . import orca_state
+from . import settings
+from . import speech
+
+from .orca_i18n import _
_scriptManager = None
diff --git a/src/orca/eventsynthesizer.py b/src/orca/eventsynthesizer.py
index 899e2e4..d7b5826 100644
--- a/src/orca/eventsynthesizer.py
+++ b/src/orca/eventsynthesizer.py
@@ -26,7 +26,7 @@ __copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
import pyatspi
-import debug
+from . import debug
def generateMouseEvent(x, y, eventName):
"""Synthesize a mouse event at a specific screen coordinate.
diff --git a/src/orca/find.py b/src/orca/find.py
index bc34787..2fed5e7 100644
--- a/src/orca/find.py
+++ b/src/orca/find.py
@@ -29,11 +29,11 @@ __license__ = "LGPL"
import copy
import re
-import debug
-import flat_review
-import orca_state
+from . import debug
+from . import flat_review
+from . import orca_state
-from orca_i18n import _ # for gettext support
+from .orca_i18n import _
class SearchQuery:
"""Represents a search that the user wants to perform."""
diff --git a/src/orca/flat_review.py b/src/orca/flat_review.py
index d8f56b5..ed0bd43 100644
--- a/src/orca/flat_review.py
+++ b/src/orca/flat_review.py
@@ -28,16 +28,16 @@ __license__ = "LGPL"
import pyatspi
import re
-import braille
-import debug
-import eventsynthesizer
-import orca_state
-import settings
-
-from braille_generator import BrailleGenerator
-from orca_i18n import _ # for gettext support
-from orca_i18n import C_ # to provide qualified translatable strings
-from orca_i18n import ngettext
+from . import braille
+from . import debug
+from . import eventsynthesizer
+from . import orca_state
+from . import settings
+
+from .braille_generator import BrailleGenerator
+from .orca_i18n import _
+from .orca_i18n import C_
+from .orca_i18n import ngettext
# [[[WDW - HACK Regular expression to split strings on whitespace
# boundaries, which is what we'll use for word dividers instead of
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index ce7d650..f8907c1 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -29,7 +29,7 @@ import copy
import pyatspi
-import settings
+from . import settings
# pylint: disable-msg=C0301
@@ -616,7 +616,7 @@ class Formatting(dict):
self.update(copy.deepcopy(formatting))
def update(self, newDict):
- for key, val in newDict.items():
+ for key, val in list(newDict.items()):
if key in self:
if isinstance(self[key], dict) and isinstance(val, dict):
self[key].update(val)
diff --git a/src/orca/generator.py b/src/orca/generator.py
index ccdcd99..f302a18 100644
--- a/src/orca/generator.py
+++ b/src/orca/generator.py
@@ -31,11 +31,11 @@ import traceback
import pyatspi
-import braille
-import debug
-import settings
+from . import braille
+from . import debug
+from . import settings
-from orca_i18n import _ # for gettext support
+from .orca_i18n import _ # for gettext support
import collections
def _formatExceptionInfo(maxTBlevel=5):
diff --git a/src/orca/input_event.py b/src/orca/input_event.py
index a4a92e0..149b879 100644
--- a/src/orca/input_event.py
+++ b/src/orca/input_event.py
@@ -31,11 +31,11 @@ import pyatspi
import time
import unicodedata
-import debug
-import keynames
-import orca_state
-import settings
-from orca_i18n import C_
+from . import debug
+from . import keynames
+from . import orca_state
+from . import settings
+from .orca_i18n import C_
KEYBOARD_EVENT = "keyboard"
BRAILLE_EVENT = "braille"
diff --git a/src/orca/keybindings.py b/src/orca/keybindings.py
index de2deff..733b802 100644
--- a/src/orca/keybindings.py
+++ b/src/orca/keybindings.py
@@ -29,10 +29,10 @@ __license__ = "LGPL"
from gi.repository import Gdk
import pyatspi
-import debug
-import settings
+from . import debug
+from . import settings
-from orca_i18n import _
+from .orca_i18n import _
_keysymsCache = {}
_keycodeCache = {}
diff --git a/src/orca/keynames.py b/src/orca/keynames.py
index 2c7c0b4..d533330 100644
--- a/src/orca/keynames.py
+++ b/src/orca/keynames.py
@@ -26,10 +26,10 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2006-2008 Sun Microsystems Inc."
__license__ = "LGPL"
-import chnames
+from . import chnames
-from orca_i18n import _ # for gettext support
-from orca_i18n import C_
+from .orca_i18n import _
+from .orca_i18n import C_
# __keynames is a dictionary where the keys represent a UTF-8
# string for a keyboard key and the values represent the common
diff --git a/src/orca/label_inference.py b/src/orca/label_inference.py
index 4d61b7d..1436f70 100644
--- a/src/orca/label_inference.py
+++ b/src/orca/label_inference.py
@@ -29,7 +29,7 @@ __license__ = "LGPL"
import pyatspi
-import debug
+from . import debug
class LabelInference:
diff --git a/src/orca/laptop_keyboardmap.py b/src/orca/laptop_keyboardmap.py
index ef51dcb..03bd9e8 100644
--- a/src/orca/laptop_keyboardmap.py
+++ b/src/orca/laptop_keyboardmap.py
@@ -28,7 +28,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2010 Joanmarie Diggs, Mesar Hameed."
__license__ = "LGPL"
-import settings
+from . import settings
# Storing values
defaultModifierMask = settings.defaultModifierMask
diff --git a/src/orca/liveregions.py b/src/orca/liveregions.py
index 025b424..89e9191 100644
--- a/src/orca/liveregions.py
+++ b/src/orca/liveregions.py
@@ -1,12 +1,12 @@
import bisect
from gi.repository import GObject
-import orca_state
+from . import orca_state
import pyatspi
-import speech
+from . import speech
import copy
import time
-from orca_i18n import _
+from .orca_i18n import _
# define 'live' property types
LIVE_OFF = -1
@@ -142,7 +142,7 @@ class LiveRegionManager:
# objects that are not registered for this page
newpoliteness = {}
currenturi = self._script.bookmarks.getURIKey()
- for key, value in self._politenessOverrides.items():
+ for key, value in list(self._politenessOverrides.items()):
if key[0] == currenturi or value != LIVE_NONE:
newpoliteness[key] = value
self._politenessOverrides = newpoliteness
@@ -336,7 +336,7 @@ class LiveRegionManager:
# The user wants to restore politeness levels
else:
- for key, value in self._restoreOverrides.items():
+ for key, value in list(self._restoreOverrides.items()):
self._politenessOverrides[key] = value
# Translators: This lets the user know that all live regions
# have been restored to their original politeness level.
diff --git a/src/orca/logger.py b/src/orca/logger.py
index 700b642..0530d97 100644
--- a/src/orca/logger.py
+++ b/src/orca/logger.py
@@ -29,9 +29,9 @@ __copyright__ = "Copyright (c) 2012 Igalia, S.L."
__license__ = "LGPL"
import logging
-import StringIO
+import io
-import debug
+from . import debug
class Logger:
@@ -72,7 +72,7 @@ class Logger:
def _createStreamHandlers(self):
for logger in self._types:
- stringIO = StringIO.StringIO()
+ stringIO = io.StringIO()
handler = logging.StreamHandler(stringIO)
self._streamHandlers[logger] = [stringIO, handler]
log = logging.getLogger(logger)
diff --git a/src/orca/mouse_review.py b/src/orca/mouse_review.py
index aec3ea9..480901c 100644
--- a/src/orca/mouse_review.py
+++ b/src/orca/mouse_review.py
@@ -25,7 +25,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2008 Eitan Isaacson"
__license__ = "LGPL"
-import debug
+from . import debug
try:
from gi.repository import Wnck
@@ -39,10 +39,10 @@ import pyatspi
from gi.repository import Gdk
from gi.repository import GObject
-import orca
-import speech
-import braille
-import settings
+import orca # Deal with this during final Python 3 conversion
+from . import speech
+from . import braille
+from . import settings
_scriptManager = getattr(orca, '_scriptManager')
_eventManager = getattr(orca, '_eventManager')
diff --git a/src/orca/notification_messages.py b/src/orca/notification_messages.py
index 366c15a..b0839af 100644
--- a/src/orca/notification_messages.py
+++ b/src/orca/notification_messages.py
@@ -25,15 +25,15 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2010 Informal Informatica LTDA."
__license__ = "LGPL"
-import settings
+from . import settings
import pyatspi
-import input_event
-import orca_state
-import debug
+from . import input_event
+from . import orca_state
+from . import debug
-from orca_i18n import _
-from orca_i18n import C_
-from orca_i18n import ngettext
+from .orca_i18n import _
+from .orca_i18n import C_
+from .orca_i18n import ngettext
# to store the messages generated by the notification daemon
notificationMessages = []
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 45f47a3..31dc309 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -70,11 +70,11 @@ except:
# Importing anything that requires a functioning settings manager
# instance should NOT be done here.
#
-import debug
-import orca_platform
-import settings
-from orca_i18n import _
-from orca_i18n import ngettext
+from . import debug
+from . import orca_platform
+from . import settings
+from .orca_i18n import _
+from .orca_i18n import ngettext
def onEnabledChanged(gsetting, key):
try:
@@ -391,31 +391,31 @@ options.validate()
# import anything which might expect to be able to use the Settings Manager
# You have been warned.
#
-from settings_manager import SettingsManager
+from .settings_manager import SettingsManager
_settingsManager = SettingsManager(prefsDir=options.userPrefsDir)
if _settingsManager is None:
print("Could not load the settings manager. Exiting.")
sys.exit(1)
-from event_manager import EventManager
+from .event_manager import EventManager
_eventManager = EventManager()
-from script_manager import ScriptManager
+from .script_manager import ScriptManager
_scriptManager = ScriptManager()
try:
# If we don't have an active desktop, we will get a RuntimeError.
- import mouse_review
+ from . import mouse_review
except RuntimeError:
pass
-import braille
-import orca_state
-import speech
-import notification_messages
+from . import braille
+from . import orca_state
+from . import speech
+from . import notification_messages
-from input_event import BrailleEvent
-from input_event import KeyboardEvent
+from .input_event import BrailleEvent
+from .input_event import KeyboardEvent
import gc
if settings.debugMemoryUsage:
diff --git a/src/orca/orca_console_prefs.py b/src/orca/orca_console_prefs.py
index f637378..b1b3f52 100644
--- a/src/orca/orca_console_prefs.py
+++ b/src/orca/orca_console_prefs.py
@@ -29,11 +29,12 @@ __license__ = "LGPL"
import re
import sys
-import acss
-import settings
-import speech
-import speechserver
-import orca
+from . import acss
+from . import settings
+from . import speech
+from . import speechserver
+
+import orca # Deal with this during final Python 3 conversion
desktopRunning = False
try:
@@ -43,7 +44,7 @@ try:
except:
pass
-from orca_i18n import _ # for gettext support
+from .orca_i18n import _
workingFactories = []
speechServerChoice = None
diff --git a/src/orca/orca_gtkbuilder.py b/src/orca/orca_gtkbuilder.py
index a2c2654..83e9f97 100644
--- a/src/orca/orca_gtkbuilder.py
+++ b/src/orca/orca_gtkbuilder.py
@@ -28,7 +28,7 @@ __license__ = "LGPL"
import gettext
from gi.repository import Gtk
-from orca_i18n import _
+from .orca_i18n import _
class GtkBuilderWrapper:
"""
diff --git a/src/orca/orca_gui_find.py b/src/orca/orca_gui_find.py
index e6efaf4..3744e84 100644
--- a/src/orca/orca_gui_find.py
+++ b/src/orca/orca_gui_find.py
@@ -30,12 +30,12 @@ import sys
from gi.repository import Gtk
import locale
-import find
-import orca_gtkbuilder
-import orca_state
-import orca_platform
+from . import find
+from . import orca_gtkbuilder
+from . import orca_state
+from . import orca_platform
-from orca_i18n import _ # for gettext support
+from .orca_i18n import _
OS = None
diff --git a/src/orca/orca_gui_main.py b/src/orca/orca_gui_main.py
index f877318..9acc9ca 100644
--- a/src/orca/orca_gui_main.py
+++ b/src/orca/orca_gui_main.py
@@ -29,11 +29,11 @@ import locale
import sys
from gi.repository import Gtk
-import orca
-import orca_platform
-import orca_state
+from . import orca
+from . import orca_platform
+from . import orca_state
-from orca_i18n import _
+from .orca_i18n import _
OS = None
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 0f53d0f..f88e0a6 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -35,22 +35,22 @@ import locale
import pyatspi
import time
-import acss
-import debug
-import orca
-import orca_gtkbuilder
-import orca_state
-import orca_platform
-import settings
-import input_event
-import keybindings
-import pronunciation_dict
-import braille
-import speech
-import speechserver
-import text_attribute_names
-
-import orca_gui_profile
+from . import acss
+from . import debug
+from . import orca
+from . import orca_gtkbuilder
+from . import orca_state
+from . import orca_platform
+from . import settings
+from . import input_event
+from . import keybindings
+from . import pronunciation_dict
+from . import braille
+from . import speech
+from . import speechserver
+from . import text_attribute_names
+
+from . import orca_gui_profile
_settingsManager = getattr(orca, '_settingsManager')
_scriptManager = getattr(orca, '_scriptManager')
@@ -59,12 +59,12 @@ try:
import louis
except ImportError:
louis = None
-from orca_platform import tablesdir
+from .orca_platform import tablesdir
if louis and not tablesdir:
louis = None
-from orca_i18n import _ # for gettext support
-from orca_i18n import C_ # to provide qualified translatable strings
+from .orca_i18n import _
+from .orca_i18n import C_
(HANDLER, DESCRIP, MOD_MASK1, MOD_USED1, KEY1, CLICK_COUNT1, OLDTEXT1, \
TEXT1, MODIF, EDITABLE) = list(range(10))
@@ -2114,7 +2114,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
#
iterBB = self._createNode(_("Braille Bindings"))
self.bbindings = defScript.getBrailleBindings()
- for com, inputEvHand in self.bbindings.items():
+ for com, inputEvHand in list(self.bbindings.items()):
handl = defScript.getInputEventHandlerKey(inputEvHand)
self._insertRowBraille(handl, com, inputEvHand, iterBB)
diff --git a/src/orca/orca_gui_profile.py b/src/orca/orca_gui_profile.py
index 17db9e7..210aa66 100644
--- a/src/orca/orca_gui_profile.py
+++ b/src/orca/orca_gui_profile.py
@@ -31,8 +31,8 @@ import locale
import sys
from gi.repository import Gtk
-import orca_state
-from orca_i18n import _
+from . import orca_state
+from .orca_i18n import _
OS = None
newProfile = None
diff --git a/src/orca/orca_gui_quit.py b/src/orca/orca_gui_quit.py
index fb69cf5..7a9770e 100644
--- a/src/orca/orca_gui_quit.py
+++ b/src/orca/orca_gui_quit.py
@@ -29,10 +29,10 @@ import locale
import sys
from gi.repository import Gtk
-import orca
-import orca_state
-import settings
-from orca_i18n import _
+from . import orca
+from . import orca_state
+from . import settings
+from .orca_i18n import _
OS = None
diff --git a/src/orca/orca_gui_splash.py b/src/orca/orca_gui_splash.py
index 0cb859d..6b6e2be 100644
--- a/src/orca/orca_gui_splash.py
+++ b/src/orca/orca_gui_splash.py
@@ -27,15 +27,15 @@ __license__ = "LGPL"
import os
import sys
-import debug
+from . import debug
from gi.repository import Gdk
from gi.repository import Gtk
from gi.repository import GObject
import locale
-import orca_state
-import orca_platform
-from orca_i18n import _
+from . import orca_state
+from . import orca_platform
+from .orca_i18n import _
OS = None
diff --git a/src/orca/outline.py b/src/orca/outline.py
index da6bd14..87223be 100644
--- a/src/orca/outline.py
+++ b/src/orca/outline.py
@@ -29,8 +29,8 @@ import cairo
from gi.repository import Gtk
from gi.repository import Gdk
-import orca_state
-import settings
+from . import orca_state
+from . import settings
display = Gdk.Display.get_default()
screen = display.get_default_screen()
diff --git a/src/orca/phonnames.py b/src/orca/phonnames.py
index 0a9e5aa..fcc688c 100644
--- a/src/orca/phonnames.py
+++ b/src/orca/phonnames.py
@@ -26,7 +26,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2006-2008 Sun Microsystems Inc."
__license__ = "LGPL"
-from orca_i18n import _ # for gettext support
+from .orca_i18n import _
# Translators: this is a structure to assist in the generation of
# spoken military-style spelling. For example, 'abc' becomes 'alpha
diff --git a/src/orca/punctuation_settings.py b/src/orca/punctuation_settings.py
index 929e6a0..ba44993 100644
--- a/src/orca/punctuation_settings.py
+++ b/src/orca/punctuation_settings.py
@@ -45,7 +45,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
-import settings
+from . import settings
# Whether or not the spoken name for the symbol should replace the
# actual symbol or be inserted before the symbol.
diff --git a/src/orca/script.py b/src/orca/script.py
index 95d7ecf..4b8be29 100644
--- a/src/orca/script.py
+++ b/src/orca/script.py
@@ -41,20 +41,20 @@ __license__ = "LGPL"
import pyatspi
-import braille_generator
-import debug
-import flat_review
-import formatting
-import label_inference
-import keybindings
-import orca_state
-import script_utilities
-import settings
-import speech_generator
-import structural_navigation
-import where_am_I
-import bookmarks
-import tutorialgenerator
+from . import braille_generator
+from . import debug
+from . import flat_review
+from . import formatting
+from . import label_inference
+from . import keybindings
+from . import orca_state
+from . import script_utilities
+from . import settings
+from . import speech_generator
+from . import structural_navigation
+from . import where_am_I
+from . import bookmarks
+from . import tutorialgenerator
class Script:
"""The specific focus tracking scripts for applications.
@@ -192,7 +192,7 @@ class Script:
braille.py) that match the given inputEventHandler passed.
"""
return [command
- for command, handler in self.brailleBindings.items()
+ for command, handler in list(self.brailleBindings.items())
if inputEventHandler == handler]
def getFormatting(self):
@@ -317,7 +317,7 @@ class Script:
whether or not the script is active.
"""
- import orca
+ import orca # Deal with this during final Python 3 conversion
_scriptManager = getattr(orca, '_scriptManager')
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/script_manager.py b/src/orca/script_manager.py
index 99153f7..cfafcc5 100644
--- a/src/orca/script_manager.py
+++ b/src/orca/script_manager.py
@@ -24,11 +24,12 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2011. Orca Team."
__license__ = "LGPL"
-import debug
-import orca
-import orca_state
+import orca # Deal with this during final Python 3 conversion
-from scripts import apps, toolkits
+from . import debug
+from . import orca_state
+
+from .scripts import apps, toolkits
_settingsManager = getattr(orca, '_settingsManager')
_eventManager = getattr(orca, '_eventManager')
@@ -211,7 +212,7 @@ class ScriptManager:
if not app and self._defaultScript:
return self._defaultScript
- import scripts.default as default
+ from .scripts import default
script = default.Script(app)
_eventManager.registerScriptListeners(script)
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 784ea40..6fda8d3 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -32,15 +32,15 @@ import math
import pyatspi
import re
-import debug
-import keynames
-import input_event
-import mouse_review
-import orca_state
-import settings
+from . import debug
+from . import keynames
+from . import input_event
+from . import mouse_review
+from . import orca_state
+from . import settings
-from orca_i18n import _ # for gettext support
-from orca_i18n import ngettext # for ngettext support
+from .orca_i18n import _
+from .orca_i18n import ngettext
#############################################################################
# #
@@ -2416,8 +2416,8 @@ class Utilities:
adjusting for repeat character counts and punctuation.
"""
- import punctuation_settings
- import chnames
+ from . import punctuation_settings
+ from . import chnames
try:
line = line.decode("UTF-8")
@@ -2479,7 +2479,7 @@ class Utilities:
was no dictionary entry.
"""
- import pronunciation_dict
+ from . import pronunciation_dict
newSegment = pronunciation_dict.getPronunciation(
segment, self._script.app_pronunciation_dict)
@@ -2506,7 +2506,7 @@ class Utilities:
text which is also a link.
"""
- import punctuation_settings
+ from . import punctuation_settings
try:
line = line.decode("UTF-8")
diff --git a/src/orca/scripts/apps/Banshee/__init__.py b/src/orca/scripts/apps/Banshee/__init__.py
index 1d50af9..585c964 100644
--- a/src/orca/scripts/apps/Banshee/__init__.py
+++ b/src/orca/scripts/apps/Banshee/__init__.py
@@ -1 +1 @@
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/Banshee/script.py b/src/orca/scripts/apps/Banshee/script.py
index e524367..920ff05 100644
--- a/src/orca/scripts/apps/Banshee/script.py
+++ b/src/orca/scripts/apps/Banshee/script.py
@@ -1,9 +1,9 @@
import orca.scripts.default as default
import orca.orca_state as orca_state
-from script_utilities import Utilities
-from speech_generator import SpeechGenerator
-from formatting import Formatting
+from .script_utilities import Utilities
+from .speech_generator import SpeechGenerator
+from .formatting import Formatting
class Script(default.Script):
diff --git a/src/orca/scripts/apps/Eclipse/__init__.py b/src/orca/scripts/apps/Eclipse/__init__.py
index 1d50af9..585c964 100644
--- a/src/orca/scripts/apps/Eclipse/__init__.py
+++ b/src/orca/scripts/apps/Eclipse/__init__.py
@@ -1 +1 @@
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/Eclipse/script.py b/src/orca/scripts/apps/Eclipse/script.py
index c6af821..b522e2e 100644
--- a/src/orca/scripts/apps/Eclipse/script.py
+++ b/src/orca/scripts/apps/Eclipse/script.py
@@ -27,7 +27,7 @@ __license__ = "LGPL"
import orca.scripts.default as default
import pyatspi
-from script_utilities import Utilities
+from .script_utilities import Utilities
########################################################################
# #
diff --git a/src/orca/scripts/apps/Instantbird/__init__.py b/src/orca/scripts/apps/Instantbird/__init__.py
index 4856f70..1f044e4 100644
--- a/src/orca/scripts/apps/Instantbird/__init__.py
+++ b/src/orca/scripts/apps/Instantbird/__init__.py
@@ -17,4 +17,4 @@
# Free Software Foundation, Inc., Franklin Street, Fifth Floor,
# Boston MA 02110-1301 USA.
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/Instantbird/script.py b/src/orca/scripts/apps/Instantbird/script.py
index ccf1d91..3e0f29a 100644
--- a/src/orca/scripts/apps/Instantbird/script.py
+++ b/src/orca/scripts/apps/Instantbird/script.py
@@ -34,8 +34,8 @@ import orca.orca_state as orca_state
import orca.scripts.toolkits.Gecko as Gecko
import orca.speech as speech
-from chat import Chat
-from script_utilities import Utilities
+from .chat import Chat
+from .script_utilities import Utilities
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/scripts/apps/Mozilla/__init__.py b/src/orca/scripts/apps/Mozilla/__init__.py
index b691de2..71d2a26 100644
--- a/src/orca/scripts/apps/Mozilla/__init__.py
+++ b/src/orca/scripts/apps/Mozilla/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for Mozilla."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/Thunderbird/__init__.py b/src/orca/scripts/apps/Thunderbird/__init__.py
index 478d83a..a923bc0 100644
--- a/src/orca/scripts/apps/Thunderbird/__init__.py
+++ b/src/orca/scripts/apps/Thunderbird/__init__.py
@@ -26,4 +26,4 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/Thunderbird/script.py b/src/orca/scripts/apps/Thunderbird/script.py
index 1eed892..876a171 100644
--- a/src/orca/scripts/apps/Thunderbird/script.py
+++ b/src/orca/scripts/apps/Thunderbird/script.py
@@ -36,10 +36,10 @@ import orca.scripts.toolkits.Gecko as Gecko
from orca.orca_i18n import _
-from formatting import Formatting
-from speech_generator import SpeechGenerator
-from script_utilities import Utilities
-import script_settings
+from .formatting import Formatting
+from .speech_generator import SpeechGenerator
+from .script_utilities import Utilities
+from . import script_settings
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/scripts/apps/acroread/__init__.py b/src/orca/scripts/apps/acroread/__init__.py
index 50236c4..66ce982 100644
--- a/src/orca/scripts/apps/acroread/__init__.py
+++ b/src/orca/scripts/apps/acroread/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for Acrobat Reader."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/ddu/__init__.py b/src/orca/scripts/apps/ddu/__init__.py
index d3e0390..d1b27e7 100644
--- a/src/orca/scripts/apps/ddu/__init__.py
+++ b/src/orca/scripts/apps/ddu/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for DDU."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/ddu/script.py b/src/orca/scripts/apps/ddu/script.py
index b75eb11..95afa3c 100644
--- a/src/orca/scripts/apps/ddu/script.py
+++ b/src/orca/scripts/apps/ddu/script.py
@@ -33,7 +33,7 @@ import orca.scripts.default as default
import orca.orca_state as orca_state
import orca.speech as speech
-from script_utilities import Utilities
+from .script_utilities import Utilities
########################################################################
# #
diff --git a/src/orca/scripts/apps/ekiga/__init__.py b/src/orca/scripts/apps/ekiga/__init__.py
index ef82e28..21d50f8 100644
--- a/src/orca/scripts/apps/ekiga/__init__.py
+++ b/src/orca/scripts/apps/ekiga/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for Ekiga."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/empathy/__init__.py b/src/orca/scripts/apps/empathy/__init__.py
index 4856f70..1f044e4 100644
--- a/src/orca/scripts/apps/empathy/__init__.py
+++ b/src/orca/scripts/apps/empathy/__init__.py
@@ -17,4 +17,4 @@
# Free Software Foundation, Inc., Franklin Street, Fifth Floor,
# Boston MA 02110-1301 USA.
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/empathy/script.py b/src/orca/scripts/apps/empathy/script.py
index cd01112..fd7f91e 100644
--- a/src/orca/scripts/apps/empathy/script.py
+++ b/src/orca/scripts/apps/empathy/script.py
@@ -30,7 +30,7 @@ import pyatspi
import orca.chat as chat
import orca.scripts.default as default
-from script_utilities import Utilities
+from .script_utilities import Utilities
########################################################################
# #
diff --git a/src/orca/scripts/apps/evolution/__init__.py b/src/orca/scripts/apps/evolution/__init__.py
index cb9576e..e8259a7 100644
--- a/src/orca/scripts/apps/evolution/__init__.py
+++ b/src/orca/scripts/apps/evolution/__init__.py
@@ -19,4 +19,4 @@
"""Custom script for Evolution."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/evolution/script.py b/src/orca/scripts/apps/evolution/script.py
index 2e256e8..39251b1 100644
--- a/src/orca/scripts/apps/evolution/script.py
+++ b/src/orca/scripts/apps/evolution/script.py
@@ -40,9 +40,9 @@ import orca.settings as settings
from orca.orca_i18n import _ # for gettext support
-from formatting import Formatting
-from speech_generator import SpeechGenerator
-from script_utilities import Utilities
+from .formatting import Formatting
+from .speech_generator import SpeechGenerator
+from .script_utilities import Utilities
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/scripts/apps/gajim/__init__.py b/src/orca/scripts/apps/gajim/__init__.py
index 4856f70..1f044e4 100644
--- a/src/orca/scripts/apps/gajim/__init__.py
+++ b/src/orca/scripts/apps/gajim/__init__.py
@@ -17,4 +17,4 @@
# Free Software Foundation, Inc., Franklin Street, Fifth Floor,
# Boston MA 02110-1301 USA.
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gcalctool/__init__.py b/src/orca/scripts/apps/gcalctool/__init__.py
index cb9576e..e8259a7 100644
--- a/src/orca/scripts/apps/gcalctool/__init__.py
+++ b/src/orca/scripts/apps/gcalctool/__init__.py
@@ -19,4 +19,4 @@
"""Custom script for Evolution."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gcalctool/script.py b/src/orca/scripts/apps/gcalctool/script.py
index 0c6217b..9579b52 100644
--- a/src/orca/scripts/apps/gcalctool/script.py
+++ b/src/orca/scripts/apps/gcalctool/script.py
@@ -31,7 +31,7 @@ import orca.orca_state as orca_state
import orca.speech as speech
import pyatspi
-from speech_generator import SpeechGenerator
+from .speech_generator import SpeechGenerator
from orca.orca_i18n import _ # for gettext support
diff --git a/src/orca/scripts/apps/gdm-simple-greeter/__init__.py b/src/orca/scripts/apps/gdm-simple-greeter/__init__.py
index 14afa8d..35c1bd5 100644
--- a/src/orca/scripts/apps/gdm-simple-greeter/__init__.py
+++ b/src/orca/scripts/apps/gdm-simple-greeter/__init__.py
@@ -1,3 +1,3 @@
"""Custom script for gdm-simple-greeter"""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gdmlogin/__init__.py b/src/orca/scripts/apps/gdmlogin/__init__.py
index 0beb913..6c8506a 100644
--- a/src/orca/scripts/apps/gdmlogin/__init__.py
+++ b/src/orca/scripts/apps/gdmlogin/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for gdmlogin."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gedit/__init__.py b/src/orca/scripts/apps/gedit/__init__.py
index 917c5c4..031235e 100644
--- a/src/orca/scripts/apps/gedit/__init__.py
+++ b/src/orca/scripts/apps/gedit/__init__.py
@@ -25,4 +25,4 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gnome-keyring-ask/__init__.py b/src/orca/scripts/apps/gnome-keyring-ask/__init__.py
index 78ba41c..d7fc609 100644
--- a/src/orca/scripts/apps/gnome-keyring-ask/__init__.py
+++ b/src/orca/scripts/apps/gnome-keyring-ask/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for gnome-keyring-ask"""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gnome-mud/__init__.py b/src/orca/scripts/apps/gnome-mud/__init__.py
index eb854b3..2a44cf6 100644
--- a/src/orca/scripts/apps/gnome-mud/__init__.py
+++ b/src/orca/scripts/apps/gnome-mud/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for gnome-mud."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gnome-panel/__init__.py b/src/orca/scripts/apps/gnome-panel/__init__.py
index b14506e..80ef9a1 100644
--- a/src/orca/scripts/apps/gnome-panel/__init__.py
+++ b/src/orca/scripts/apps/gnome-panel/__init__.py
@@ -19,5 +19,5 @@
""" Custom script for gnome-panel"""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gnome-panel/script.py b/src/orca/scripts/apps/gnome-panel/script.py
index c0e0728..71d4cc2 100644
--- a/src/orca/scripts/apps/gnome-panel/script.py
+++ b/src/orca/scripts/apps/gnome-panel/script.py
@@ -31,7 +31,7 @@ import orca.debug as debug
import orca.speech as speech
import pyatspi
-from speech_generator import SpeechGenerator
+from .speech_generator import SpeechGenerator
########################################################################
# #
diff --git a/src/orca/scripts/apps/gnome-screensaver-dialog/__init__.py b/src/orca/scripts/apps/gnome-screensaver-dialog/__init__.py
index e1c66d6..d6f5849 100644
--- a/src/orca/scripts/apps/gnome-screensaver-dialog/__init__.py
+++ b/src/orca/scripts/apps/gnome-screensaver-dialog/__init__.py
@@ -18,5 +18,5 @@
# Boston MA 02110-1301 USA.
"""Custom script for gnome-screensaver-dialog."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gnome-search-tool/__init__.py b/src/orca/scripts/apps/gnome-search-tool/__init__.py
index a3c99e8..77fd362 100644
--- a/src/orca/scripts/apps/gnome-search-tool/__init__.py
+++ b/src/orca/scripts/apps/gnome-search-tool/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for gnome-search-tool"""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gnome-system-monitor/__init__.py b/src/orca/scripts/apps/gnome-system-monitor/__init__.py
index 59dc02a..15ff827 100644
--- a/src/orca/scripts/apps/gnome-system-monitor/__init__.py
+++ b/src/orca/scripts/apps/gnome-system-monitor/__init__.py
@@ -19,5 +19,5 @@
""" Custom script for Gnome System Monitor."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gnome-terminal/__init__.py b/src/orca/scripts/apps/gnome-terminal/__init__.py
index b5b87ee..52f01ef 100644
--- a/src/orca/scripts/apps/gnome-terminal/__init__.py
+++ b/src/orca/scripts/apps/gnome-terminal/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for gnome-terminal."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gnome-window-properties/__init__.py b/src/orca/scripts/apps/gnome-window-properties/__init__.py
index a7cf367..7fb5d93 100644
--- a/src/orca/scripts/apps/gnome-window-properties/__init__.py
+++ b/src/orca/scripts/apps/gnome-window-properties/__init__.py
@@ -25,4 +25,4 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gnome-window-properties/script.py b/src/orca/scripts/apps/gnome-window-properties/script.py
index c51bcda..597c38d 100644
--- a/src/orca/scripts/apps/gnome-window-properties/script.py
+++ b/src/orca/scripts/apps/gnome-window-properties/script.py
@@ -27,7 +27,7 @@ __license__ = "LGPL"
import orca.scripts.default as default
-from formatting import Formatting
+from .formatting import Formatting
########################################################################
# #
diff --git a/src/orca/scripts/apps/gnome_segv2/__init__.py b/src/orca/scripts/apps/gnome_segv2/__init__.py
index 52f6a74..485efc8 100644
--- a/src/orca/scripts/apps/gnome_segv2/__init__.py
+++ b/src/orca/scripts/apps/gnome_segv2/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for gnome_segv2."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/gtk-window-decorator/__init__.py b/src/orca/scripts/apps/gtk-window-decorator/__init__.py
index af6988c..f7b1509 100644
--- a/src/orca/scripts/apps/gtk-window-decorator/__init__.py
+++ b/src/orca/scripts/apps/gtk-window-decorator/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for gtk-window-decorator."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/liferea/__init__.py b/src/orca/scripts/apps/liferea/__init__.py
index 69c1299..6589e6b 100644
--- a/src/orca/scripts/apps/liferea/__init__.py
+++ b/src/orca/scripts/apps/liferea/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for liferea."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/metacity/__init__.py b/src/orca/scripts/apps/metacity/__init__.py
index 94015e7..7190f56 100644
--- a/src/orca/scripts/apps/metacity/__init__.py
+++ b/src/orca/scripts/apps/metacity/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for metacity."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/nautilus/__init__.py b/src/orca/scripts/apps/nautilus/__init__.py
index 2187b82..713cb9f 100644
--- a/src/orca/scripts/apps/nautilus/__init__.py
+++ b/src/orca/scripts/apps/nautilus/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for nautilus"""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/notification-daemon/__init__.py b/src/orca/scripts/apps/notification-daemon/__init__.py
index ff0ae90..50438da 100644
--- a/src/orca/scripts/apps/notification-daemon/__init__.py
+++ b/src/orca/scripts/apps/notification-daemon/__init__.py
@@ -19,5 +19,5 @@
""" Custom script for The notification daemon."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/notify-osd/__init__.py b/src/orca/scripts/apps/notify-osd/__init__.py
index 61bbed4..cff97e3 100644
--- a/src/orca/scripts/apps/notify-osd/__init__.py
+++ b/src/orca/scripts/apps/notify-osd/__init__.py
@@ -19,5 +19,5 @@
""" Custom script for The notify-osd"""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/packagemanager/__init__.py b/src/orca/scripts/apps/packagemanager/__init__.py
index 0afff62..b1cb34f 100644
--- a/src/orca/scripts/apps/packagemanager/__init__.py
+++ b/src/orca/scripts/apps/packagemanager/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for Packagemanager."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/packagemanager/script.py b/src/orca/scripts/apps/packagemanager/script.py
index ffa5d9a..56d0a3e 100644
--- a/src/orca/scripts/apps/packagemanager/script.py
+++ b/src/orca/scripts/apps/packagemanager/script.py
@@ -38,12 +38,12 @@ import orca.speech as speech
from orca.orca_i18n import _
-from braille_generator import BrailleGenerator
-from speech_generator import SpeechGenerator
-from tutorialgenerator import TutorialGenerator
-from script_utilities import Utilities
+from .braille_generator import BrailleGenerator
+from .speech_generator import SpeechGenerator
+from .tutorialgenerator import TutorialGenerator
+from .script_utilities import Utilities
-import script_settings
+from . import script_settings
########################################################################
# #
diff --git a/src/orca/scripts/apps/pidgin/__init__.py b/src/orca/scripts/apps/pidgin/__init__.py
index afec4a1..33de977 100644
--- a/src/orca/scripts/apps/pidgin/__init__.py
+++ b/src/orca/scripts/apps/pidgin/__init__.py
@@ -17,4 +17,4 @@
# Free Software Foundation, Inc., Franklin Street, Fifth Floor,
# Boston MA 02110-1301 USA.
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/pidgin/script.py b/src/orca/scripts/apps/pidgin/script.py
index e66cd93..1bb141f 100644
--- a/src/orca/scripts/apps/pidgin/script.py
+++ b/src/orca/scripts/apps/pidgin/script.py
@@ -33,9 +33,9 @@ import orca.speech as speech
from orca.orca_i18n import _
-from chat import Chat
-from script_utilities import Utilities
-from speech_generator import SpeechGenerator
+from .chat import Chat
+from .script_utilities import Utilities
+from .speech_generator import SpeechGenerator
########################################################################
# #
diff --git a/src/orca/scripts/apps/planner/__init__.py b/src/orca/scripts/apps/planner/__init__.py
index d953bf9..1eb4b5e 100644
--- a/src/orca/scripts/apps/planner/__init__.py
+++ b/src/orca/scripts/apps/planner/__init__.py
@@ -25,4 +25,4 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2006-2008 Sun Microsystems Inc."
__license__ = "LGPL"
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/planner/script.py b/src/orca/scripts/apps/planner/script.py
index 860f9e0..fd7f661 100644
--- a/src/orca/scripts/apps/planner/script.py
+++ b/src/orca/scripts/apps/planner/script.py
@@ -27,8 +27,8 @@ __license__ = "LGPL"
import orca.scripts.default as default
-from braille_generator import BrailleGenerator
-from speech_generator import SpeechGenerator
+from .braille_generator import BrailleGenerator
+from .speech_generator import SpeechGenerator
########################################################################
# #
diff --git a/src/orca/scripts/apps/rhythmbox/__init__.py b/src/orca/scripts/apps/rhythmbox/__init__.py
index f266db7..fe6c658 100644
--- a/src/orca/scripts/apps/rhythmbox/__init__.py
+++ b/src/orca/scripts/apps/rhythmbox/__init__.py
@@ -25,4 +25,4 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/apps/rhythmbox/script.py b/src/orca/scripts/apps/rhythmbox/script.py
index 39b87d4..ea1668f 100644
--- a/src/orca/scripts/apps/rhythmbox/script.py
+++ b/src/orca/scripts/apps/rhythmbox/script.py
@@ -33,9 +33,9 @@ import orca.scripts.default as default
import orca.orca as orca
import orca.orca_state as orca_state
-from speech_generator import SpeechGenerator
-from braille_generator import BrailleGenerator
-from formatting import Formatting
+from .speech_generator import SpeechGenerator
+from .braille_generator import BrailleGenerator
+from .formatting import Formatting
class Script(default.Script):
diff --git a/src/orca/scripts/apps/soffice/__init__.py b/src/orca/scripts/apps/soffice/__init__.py
index f0ef34c..e5c3334 100644
--- a/src/orca/scripts/apps/soffice/__init__.py
+++ b/src/orca/scripts/apps/soffice/__init__.py
@@ -1,2 +1,2 @@
-from script import Script
-import script_settings
+from .script import Script
+from . import script_settings
diff --git a/src/orca/scripts/apps/soffice/script.py b/src/orca/scripts/apps/soffice/script.py
index a1bc773..82de64d 100644
--- a/src/orca/scripts/apps/soffice/script.py
+++ b/src/orca/scripts/apps/soffice/script.py
@@ -52,12 +52,12 @@ import orca.settings as settings
from orca.orca_i18n import _ # for gettext support
from orca.orca_i18n import ngettext
-from speech_generator import SpeechGenerator
-from braille_generator import BrailleGenerator
-from formatting import Formatting
-from structural_navigation import StructuralNavigation
-from script_utilities import Utilities
-import script_settings
+from .speech_generator import SpeechGenerator
+from .braille_generator import BrailleGenerator
+from .formatting import Formatting
+from .structural_navigation import StructuralNavigation
+from .script_utilities import Utilities
+from . import script_settings
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/scripts/apps/soffice/speech_generator.py b/src/orca/scripts/apps/soffice/speech_generator.py
index 6d26c07..5a9045c 100644
--- a/src/orca/scripts/apps/soffice/speech_generator.py
+++ b/src/orca/scripts/apps/soffice/speech_generator.py
@@ -33,7 +33,7 @@ import orca.speech_generator as speech_generator
from orca.orca_i18n import ngettext # for ngettext support
from orca.orca_i18n import _ # for gettext support
-import script_settings
+from . import script_settings
_settingsManager = getattr(orca, '_settingsManager')
class SpeechGenerator(speech_generator.SpeechGenerator):
diff --git a/src/orca/scripts/apps/xfwm4/__init__.py b/src/orca/scripts/apps/xfwm4/__init__.py
index c511409..d645e37 100644
--- a/src/orca/scripts/apps/xfwm4/__init__.py
+++ b/src/orca/scripts/apps/xfwm4/__init__.py
@@ -19,5 +19,5 @@
"""Custom script for xfwm4."""
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index d9b2a5b..1acbe5c 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -1043,7 +1043,7 @@ class Script(script.Script):
passed as argument
"""
- for keyName, handler in self.inputEventHandlers.items():
+ for keyName, handler in list(self.inputEventHandlers.items()):
if handler == inputEventHandler:
return keyName
diff --git a/src/orca/scripts/toolkits/CALLY/__init__.py b/src/orca/scripts/toolkits/CALLY/__init__.py
index 1d50af9..585c964 100644
--- a/src/orca/scripts/toolkits/CALLY/__init__.py
+++ b/src/orca/scripts/toolkits/CALLY/__init__.py
@@ -1 +1 @@
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/toolkits/Gecko/__init__.py b/src/orca/scripts/toolkits/Gecko/__init__.py
index 90052c1..72b9161 100644
--- a/src/orca/scripts/toolkits/Gecko/__init__.py
+++ b/src/orca/scripts/toolkits/Gecko/__init__.py
@@ -1,5 +1,5 @@
-from script import Script
-from speech_generator import SpeechGenerator
-from braille_generator import BrailleGenerator
-from script_utilities import Utilities
-import script_settings
+from .script import Script
+from .speech_generator import SpeechGenerator
+from .braille_generator import BrailleGenerator
+from .script_utilities import Utilities
+from . import script_settings
diff --git a/src/orca/scripts/toolkits/Gecko/bookmarks.py b/src/orca/scripts/toolkits/Gecko/bookmarks.py
index 182486e..05fbbed 100644
--- a/src/orca/scripts/toolkits/Gecko/bookmarks.py
+++ b/src/orca/scripts/toolkits/Gecko/bookmarks.py
@@ -144,7 +144,7 @@ class GeckoBookmarks(bookmarks.Bookmarks):
saved = {}
# save obj as a path instead of an accessible
- for index, bookmark in self._bookmarks.items():
+ for index, bookmark in list(self._bookmarks.items()):
saved[index] = bookmark[0], bookmark[1]
try:
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 14af07f..7aca872 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -60,14 +60,14 @@ import orca.settings as settings
import orca.speech as speech
import orca.speechserver as speechserver
-import keymaps
-import script_settings
-from braille_generator import BrailleGenerator
-from speech_generator import SpeechGenerator
-from formatting import Formatting
-from bookmarks import GeckoBookmarks
-from structural_navigation import GeckoStructuralNavigation
-from script_utilities import Utilities
+from . import keymaps
+from . import script_settings
+from .braille_generator import BrailleGenerator
+from .speech_generator import SpeechGenerator
+from .formatting import Formatting
+from .bookmarks import GeckoBookmarks
+from .structural_navigation import GeckoStructuralNavigation
+from .script_utilities import Utilities
from orca.orca_i18n import _
from orca.speech_generator import Pause
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py b/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
index 5707f93..9213def 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
@@ -1,2 +1,2 @@
-from script import Script
-from speech_generator import SpeechGenerator
+from .script import Script
+from .speech_generator import SpeechGenerator
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
index 0138b2a..8f4479a 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
@@ -32,9 +32,9 @@ import orca.input_event as input_event
import orca.orca as orca
import orca.orca_state as orca_state
-from script_utilities import Utilities
-from speech_generator import SpeechGenerator
-from formatting import Formatting
+from .script_utilities import Utilities
+from .speech_generator import SpeechGenerator
+from .formatting import Formatting
########################################################################
# #
diff --git a/src/orca/scripts/toolkits/WebKitGtk/__init__.py b/src/orca/scripts/toolkits/WebKitGtk/__init__.py
index 1d50af9..585c964 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/__init__.py
+++ b/src/orca/scripts/toolkits/WebKitGtk/__init__.py
@@ -1 +1 @@
-from script import Script
+from .script import Script
diff --git a/src/orca/scripts/toolkits/WebKitGtk/script.py b/src/orca/scripts/toolkits/WebKitGtk/script.py
index 41d2a49..67da9fc 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/script.py
+++ b/src/orca/scripts/toolkits/WebKitGtk/script.py
@@ -39,11 +39,11 @@ import orca.orca_state as orca_state
import orca.speech as speech
from orca.orca_i18n import _
-import script_settings
-from structural_navigation import StructuralNavigation
-from braille_generator import BrailleGenerator
-from speech_generator import SpeechGenerator
-from script_utilities import Utilities
+from . import script_settings
+from .structural_navigation import StructuralNavigation
+from .braille_generator import BrailleGenerator
+from .speech_generator import SpeechGenerator
+from .script_utilities import Utilities
_settingsManager = getattr(orca, '_settingsManager')
diff --git a/src/orca/settings.py b/src/orca/settings.py
index f1c2dfb..16e4da2 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -52,9 +52,9 @@ except:
import pyatspi
-from acss import ACSS
-from orca_i18n import _ # for gettext support
-from orca_i18n import C_ # to provide qualified translatable strings
+from .acss import ACSS
+from .orca_i18n import _
+from .orca_i18n import C_
# These are the settings that Orca supports the user customizing.
#
@@ -716,7 +716,7 @@ chatRoomHistories = False
# Allow for the customization of key bindings.
#
def overrideKeyBindings(script, keyBindings):
- import orca
+ import orca # Deal with this during final Python 3 conversion
_settingsManager = getattr(orca, '_settingsManager')
return _settingsManager.overrideKeyBindings(script, keyBindings)
diff --git a/src/orca/settings_manager.py b/src/orca/settings_manager.py
index 02a18bc..3c13913 100644
--- a/src/orca/settings_manager.py
+++ b/src/orca/settings_manager.py
@@ -33,10 +33,10 @@ import imp
from gi.repository import Gio, GLib
from json import load
-import debug
-from keybindings import KeyBinding
-import settings
-import pronunciation_dict
+from . import debug
+from .keybindings import KeyBinding
+from . import settings
+from . import pronunciation_dict
try:
_proxy = Gio.DBusProxy.new_for_bus_sync(
@@ -521,7 +521,7 @@ class SettingsManager(object):
self._loadProfileSettings()
script.voices = self.getSetting('voices')
- import orca
+ import orca # Deal with this during final Python 3 conversion
_scriptManager = getattr(orca, '_scriptManager')
app = script.app
diff --git a/src/orca/speech.py b/src/orca/speech.py
index c39d34b..0700f90 100644
--- a/src/orca/speech.py
+++ b/src/orca/speech.py
@@ -32,14 +32,14 @@ log = logging.getLogger("speech")
import re
import time
-import chnames
-import debug
-import orca_state
-import settings
-import sound
-import speech_generator
+from . import chnames
+from . import debug
+from . import orca_state
+from . import settings
+from . import sound
+from . import speech_generator
-from acss import ACSS
+from .acss import ACSS
# The speech server to use for all speech operations.
#
@@ -405,7 +405,7 @@ def testNoSettingsInit():
speak("this is normal")
def test():
- import speechserver
+ from . import speechserver
factories = getSpeechServerFactories()
for factory in factories:
print(factory.__name__)
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 49dd9f1..371fadd 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -29,16 +29,17 @@ import pyatspi
import urlparse, urllib2
from gi.repository import Atspi, Atk
-import debug
-import generator
-import orca
-import settings
-import sound
-import text_attribute_names
-
-from orca_i18n import _ # for gettext support
-from orca_i18n import ngettext # for ngettext support
-from orca_i18n import C_ # to provide qualified translatable strings
+import orca # Deal with this during final Python 3 conversion
+
+from . import debug
+from . import generator
+from . import settings
+from . import sound
+from . import text_attribute_names
+
+from .orca_i18n import _
+from .orca_i18n import ngettext
+from .orca_i18n import C_
class Pause:
"""A dummy class to indicate we want to insert a pause into an
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index 11c072f..47f0928 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -41,14 +41,14 @@ __license__ = "LGPL"
from gi.repository import GObject
import re
-import chnames
-import debug
-import speechserver
-import settings
-import orca_state
-import punctuation_settings
-from acss import ACSS
-from orca_i18n import _
+from . import chnames
+from . import debug
+from . import speechserver
+from . import settings
+from . import orca_state
+from . import punctuation_settings
+from .acss import ACSS
+from .orca_i18n import _
try:
import speechd
diff --git a/src/orca/speechserver.py b/src/orca/speechserver.py
index 82972f5..7ed0bda 100644
--- a/src/orca/speechserver.py
+++ b/src/orca/speechserver.py
@@ -31,14 +31,14 @@ __copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
import logging
-import settings
-import orca_state
+from . import settings
+from . import orca_state
log = logging.getLogger("speech")
-import debug
+from . import debug
-from acss import ACSS
+from .acss import ACSS
class VoiceFamily(dict):
"""Holds the family description for a voice."""
diff --git a/src/orca/structural_navigation.py b/src/orca/structural_navigation.py
index 1986966..cb92ec1 100644
--- a/src/orca/structural_navigation.py
+++ b/src/orca/structural_navigation.py
@@ -29,17 +29,17 @@ __license__ = "LGPL"
import pyatspi
-import debug
-import input_event
-import keybindings
-import orca
-import orca_state
-import settings
-import speech
-
-from orca_i18n import _
-from orca_i18n import ngettext
-from orca_i18n import C_
+import orca # Deal with this during final Python 3 conversion
+from . import debug
+from . import input_event
+from . import keybindings
+from . import orca_state
+from . import settings
+from . import speech
+
+from .orca_i18n import _
+from .orca_i18n import ngettext
+from .orca_i18n import C_
#############################################################################
# #
diff --git a/src/orca/text_attribute_names.py b/src/orca/text_attribute_names.py
index 3f27435..0ee9f5c 100644
--- a/src/orca/text_attribute_names.py
+++ b/src/orca/text_attribute_names.py
@@ -26,8 +26,8 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2008 Sun Microsystems Inc."
__license__ = "LGPL"
-from orca_i18n import C_ # to provide qualified translatable strings
-import orca_state
+from .orca_i18n import C_
+from . import orca_state
# Translators: this is a structure to assist in the generation of
# localized strings for the various text attributes.
diff --git a/src/orca/tutorialgenerator.py b/src/orca/tutorialgenerator.py
index 80e75d8..f53c3de 100644
--- a/src/orca/tutorialgenerator.py
+++ b/src/orca/tutorialgenerator.py
@@ -30,10 +30,10 @@ __copyright__ = "Copyright (c) 2008-2009 Sun Microsystems Inc."
__license__ = "LGPL"
import pyatspi
-import debug
-import settings
+from . import debug
+from . import settings
-from orca_i18n import _ # for gettext support
+from .orca_i18n import _ # for gettext support
class TutorialGenerator:
"""Takes accessible objects and produces a tutorial string to speak
diff --git a/src/orca/where_am_I.py b/src/orca/where_am_I.py
index 5dc7e64..c2ecc5b 100644
--- a/src/orca/where_am_I.py
+++ b/src/orca/where_am_I.py
@@ -26,8 +26,8 @@ __copyright__ = "Copyright (c) 2005-2009 Sun Microsystems Inc."
__license__ = "LGPL"
import pyatspi
-import debug
-import speech
+from . import debug
+from . import speech
# [[[TODO: WDW - need to handle the old _speakText functionality that changes
# settings.verbalizePunctuationStyle = settings.PUNCTUATION_STYLE_SOME
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
