diff options
| author | Simon Schampijer <simon@laptop.org> | 2012-09-03 08:29:30 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@laptop.org> | 2012-09-07 09:14:25 (GMT) |
| commit | bbf3390ba25e90b1e3971ce233edc644188c76a7 (patch) | |
| tree | efa765afb50d395b89c2b95de59721c6d3e2c311 /src | |
| parent | 3007f43996b5ef9a9fb4ccf37906f17612438c68 (diff) | |
Run sugar-convert.sh for automatic conversion from sugar.* to sugar3.* imports
Run sugar-convert.sh [1] for automatic conversion from sugar.* imports to
sugar3.* imports. This is only on a best-effort basis; the code will
be in a broken state after this patch and need to be fixed manually.
The purpose of committing the intermediate, non-working output is to make it
reproducible. It's impractical to manually review the changes.
[1] http://dev.laptop.org/~manuq/sugar-convert.sh
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel Quiñones <manuq@laptop.org>
Diffstat (limited to 'src')
71 files changed, 239 insertions, 239 deletions
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py index d9e0bf0..7908892 100644 --- a/src/jarabe/controlpanel/gui.py +++ b/src/jarabe/controlpanel/gui.py @@ -21,9 +21,9 @@ from gettext import gettext as _ from gi.repository import GObject from gi.repository import Gtk -from sugar.graphics.icon import Icon -from sugar.graphics import style -from sugar.graphics.alert import Alert +from sugar3.graphics.icon import Icon +from sugar3.graphics import style +from sugar3.graphics.alert import Alert from jarabe.model.session import get_session_manager from jarabe.controlpanel.toolbar import MainToolbar diff --git a/src/jarabe/controlpanel/inlinealert.py b/src/jarabe/controlpanel/inlinealert.py index 49419a3..4eda804 100644 --- a/src/jarabe/controlpanel/inlinealert.py +++ b/src/jarabe/controlpanel/inlinealert.py @@ -18,8 +18,8 @@ from gi.repository import Gtk from gi.repository import GObject from gi.repository import Pango -from sugar.graphics import style -from sugar.graphics.icon import Icon +from sugar3.graphics import style +from sugar3.graphics.icon import Icon class InlineAlert(Gtk.HBox): diff --git a/src/jarabe/controlpanel/toolbar.py b/src/jarabe/controlpanel/toolbar.py index 309a2cb..6cb27a0 100644 --- a/src/jarabe/controlpanel/toolbar.py +++ b/src/jarabe/controlpanel/toolbar.py @@ -20,10 +20,10 @@ from gi.repository import GObject _ = lambda msg: gettext.dgettext('sugar', msg) -from sugar.graphics.icon import Icon -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics import iconentry -from sugar.graphics import style +from sugar3.graphics.icon import Icon +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics import iconentry +from sugar3.graphics import style class MainToolbar(Gtk.Toolbar): diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py index 83d0d9c..d0bccdb 100644 --- a/src/jarabe/desktop/activitieslist.py +++ b/src/jarabe/desktop/activitieslist.py @@ -24,12 +24,12 @@ from gi.repository import Pango from gi.repository import GConf from gi.repository import Gtk -from sugar import util -from sugar.graphics import style -from sugar.graphics.icon import Icon, CellRendererIcon -from sugar.graphics.xocolor import XoColor -from sugar.graphics.menuitem import MenuItem -from sugar.graphics.alert import Alert +from sugar3 import util +from sugar3.graphics import style +from sugar3.graphics.icon import Icon, CellRendererIcon +from sugar3.graphics.xocolor import XoColor +from sugar3.graphics.menuitem import MenuItem +from sugar3.graphics.alert import Alert from jarabe.model import bundleregistry from jarabe.view.palettes import ActivityPalette diff --git a/src/jarabe/desktop/favoriteslayout.py b/src/jarabe/desktop/favoriteslayout.py index 1b8194c..d5f6d0e 100644 --- a/src/jarabe/desktop/favoriteslayout.py +++ b/src/jarabe/desktop/favoriteslayout.py @@ -22,7 +22,7 @@ from gettext import gettext as _ from gi.repository import Gtk -from sugar.graphics import style +from sugar3.graphics import style from jarabe.model import bundleregistry from jarabe.desktop.grid import Grid diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index ef6c09c..73783a2 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -24,14 +24,14 @@ from gi.repository import GConf import glib from gi.repository import Gtk -from sugar.graphics import style -from sugar.graphics.icon import Icon -from sugar.graphics.menuitem import MenuItem -from sugar.graphics.alert import Alert -from sugar.graphics.xocolor import XoColor -from sugar.activity import activityfactory -from sugar import dispatch -from sugar.datastore import datastore +from sugar3.graphics import style +from sugar3.graphics.icon import Icon +from sugar3.graphics.menuitem import MenuItem +from sugar3.graphics.alert import Alert +from sugar3.graphics.xocolor import XoColor +from sugar3.activity import activityfactory +from sugar3 import dispatch +from sugar3.datastore import datastore from jarabe.view.palettes import JournalPalette from jarabe.view.palettes import CurrentActivityPalette diff --git a/src/jarabe/desktop/friendview.py b/src/jarabe/desktop/friendview.py index 62a3f96..c61da63 100644 --- a/src/jarabe/desktop/friendview.py +++ b/src/jarabe/desktop/friendview.py @@ -17,7 +17,7 @@ from gi.repository import Gtk -from sugar.graphics import style +from sugar3.graphics import style from jarabe.view.buddyicon import BuddyIcon from jarabe.view.eventicon import EventIcon diff --git a/src/jarabe/desktop/groupbox.py b/src/jarabe/desktop/groupbox.py index b86cdf2..3d7c0f3 100644 --- a/src/jarabe/desktop/groupbox.py +++ b/src/jarabe/desktop/groupbox.py @@ -16,7 +16,7 @@ import logging -from sugar.graphics import style +from sugar3.graphics import style from jarabe.view.buddyicon import BuddyIcon from jarabe.model.buddy import get_owner_instance diff --git a/src/jarabe/desktop/homebox.py b/src/jarabe/desktop/homebox.py index 7fa5637..188ea63 100644 --- a/src/jarabe/desktop/homebox.py +++ b/src/jarabe/desktop/homebox.py @@ -21,9 +21,9 @@ import os from gi.repository import GObject from gi.repository import Gtk -from sugar.graphics import style -from sugar.graphics.alert import Alert -from sugar.graphics.icon import Icon +from sugar3.graphics import style +from sugar3.graphics.alert import Alert +from sugar3.graphics.icon import Icon from jarabe.desktop import favoritesview from jarabe.desktop.activitieslist import ActivitiesList diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py index acd68a7..a05d7db 100644 --- a/src/jarabe/desktop/homewindow.py +++ b/src/jarabe/desktop/homewindow.py @@ -19,8 +19,8 @@ import logging from gi.repository import GObject from gi.repository import Gtk -from sugar.graphics import style -from sugar.graphics import palettegroup +from sugar3.graphics import style +from sugar3.graphics import palettegroup from jarabe.desktop.meshbox import MeshBox from jarabe.desktop.homebox import HomeBox diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index 258ef45..c0afe75 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -26,10 +26,10 @@ from gi.repository import GObject from gi.repository import Gtk from gi.repository import GConf -from sugar.graphics.icon import Icon -from sugar.graphics import style -from sugar.graphics import palette -from sugar.graphics.menuitem import MenuItem +from sugar3.graphics.icon import Icon +from sugar3.graphics import style +from sugar3.graphics import palette +from sugar3.graphics.menuitem import MenuItem from jarabe.desktop.snowflakelayout import SnowflakeLayout from jarabe.model import neighborhood diff --git a/src/jarabe/desktop/networkviews.py b/src/jarabe/desktop/networkviews.py index 83269e0..c949b7e 100644 --- a/src/jarabe/desktop/networkviews.py +++ b/src/jarabe/desktop/networkviews.py @@ -23,15 +23,15 @@ import hashlib import dbus import glib -from sugar.graphics.icon import Icon -from sugar.graphics.xocolor import XoColor -from sugar.graphics import xocolor -from sugar.graphics import style -from sugar.graphics.icon import get_icon_state -from sugar.graphics import palette -from sugar.graphics.menuitem import MenuItem -from sugar.util import unique_id -from sugar import profile +from sugar3.graphics.icon import Icon +from sugar3.graphics.xocolor import XoColor +from sugar3.graphics import xocolor +from sugar3.graphics import style +from sugar3.graphics.icon import get_icon_state +from sugar3.graphics import palette +from sugar3.graphics.menuitem import MenuItem +from sugar3.util import unique_id +from sugar3 import profile from jarabe.view.pulsingicon import EventPulsingIcon from jarabe.desktop import keydialog diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py index a3f717c..cc26e56 100644 --- a/src/jarabe/desktop/schoolserver.py +++ b/src/jarabe/desktop/schoolserver.py @@ -28,8 +28,8 @@ import sys from gi.repository import GConf -from sugar import env -from sugar.profile import get_profile +from sugar3 import env +from sugar3.profile import get_profile _REGISTER_URL = 'http://schoolserver:8080/' _REGISTER_TIMEOUT = 8 diff --git a/src/jarabe/desktop/snowflakelayout.py b/src/jarabe/desktop/snowflakelayout.py index eabfc8e..1410f4f 100644 --- a/src/jarabe/desktop/snowflakelayout.py +++ b/src/jarabe/desktop/snowflakelayout.py @@ -18,7 +18,7 @@ import math from gi.repository import Gtk -from sugar.graphics import style +from sugar3.graphics import style _BASE_DISTANCE = style.zoom(25) diff --git a/src/jarabe/desktop/transitionbox.py b/src/jarabe/desktop/transitionbox.py index 064abd1..b124b14 100644 --- a/src/jarabe/desktop/transitionbox.py +++ b/src/jarabe/desktop/transitionbox.py @@ -16,8 +16,8 @@ from gi.repository import GObject -from sugar.graphics import style -from sugar.graphics import animator +from sugar3.graphics import style +from sugar3.graphics import animator from jarabe.model.buddy import get_owner_instance from jarabe.view.buddyicon import BuddyIcon diff --git a/src/jarabe/desktop/viewtoolbar.py b/src/jarabe/desktop/viewtoolbar.py index 3ffdb8b..07c44a9 100644 --- a/src/jarabe/desktop/viewtoolbar.py +++ b/src/jarabe/desktop/viewtoolbar.py @@ -23,9 +23,9 @@ import logging from gi.repository import Gtk from gi.repository import GObject -from sugar.graphics import style -from sugar.graphics import iconentry -from sugar.graphics.radiotoolbutton import RadioToolButton +from sugar3.graphics import style +from sugar3.graphics import iconentry +from sugar3.graphics.radiotoolbutton import RadioToolButton from jarabe.desktop import favoritesview diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py index 0b44880..27d0e46 100644 --- a/src/jarabe/frame/activitiestray.py +++ b/src/jarabe/frame/activitiestray.py @@ -27,17 +27,17 @@ from gi.repository import Gio import glib from gi.repository import Gtk -from sugar.graphics import style -from sugar.graphics.tray import HTray -from sugar.graphics.xocolor import XoColor -from sugar.graphics.radiotoolbutton import RadioToolButton -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.icon import Icon, get_icon_file_name -from sugar.graphics.palette import Palette -from sugar.graphics.menuitem import MenuItem -from sugar.datastore import datastore -from sugar import mime -from sugar import env +from sugar3.graphics import style +from sugar3.graphics.tray import HTray +from sugar3.graphics.xocolor import XoColor +from sugar3.graphics.radiotoolbutton import RadioToolButton +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics.icon import Icon, get_icon_file_name +from sugar3.graphics.palette import Palette +from sugar3.graphics.menuitem import MenuItem +from sugar3.datastore import datastore +from sugar3 import mime +from sugar3 import env from jarabe.model import shell from jarabe.model import invites diff --git a/src/jarabe/frame/clipboard.py b/src/jarabe/frame/clipboard.py index 6677c28..493a9ce 100644 --- a/src/jarabe/frame/clipboard.py +++ b/src/jarabe/frame/clipboard.py @@ -23,7 +23,7 @@ import tempfile from gi.repository import GObject from gi.repository import Gtk -from sugar import mime +from sugar3 import mime from jarabe.frame.clipboardobject import ClipboardObject, Format diff --git a/src/jarabe/frame/clipboardicon.py b/src/jarabe/frame/clipboardicon.py index 321c4aa..d29f6f0 100644 --- a/src/jarabe/frame/clipboardicon.py +++ b/src/jarabe/frame/clipboardicon.py @@ -20,10 +20,10 @@ from gi.repository import GConf from gi.repository import Gtk -from sugar.graphics.radiotoolbutton import RadioToolButton -from sugar.graphics.icon import Icon -from sugar.graphics.xocolor import XoColor -from sugar.graphics import style +from sugar3.graphics.radiotoolbutton import RadioToolButton +from sugar3.graphics.icon import Icon +from sugar3.graphics.xocolor import XoColor +from sugar3.graphics import style from jarabe.frame import clipboard from jarabe.frame.clipboardmenu import ClipboardMenu diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py index c1c9764..c070189 100644 --- a/src/jarabe/frame/clipboardmenu.py +++ b/src/jarabe/frame/clipboardmenu.py @@ -24,14 +24,14 @@ import glib from gi.repository import Gtk -from sugar.graphics.palette import Palette -from sugar.graphics.menuitem import MenuItem -from sugar.graphics.icon import Icon -from sugar.graphics.xocolor import XoColor -from sugar.datastore import datastore -from sugar import mime -from sugar import env -from sugar.activity.i18n import pgettext +from sugar3.graphics.palette import Palette +from sugar3.graphics.menuitem import MenuItem +from sugar3.graphics.icon import Icon +from sugar3.graphics.xocolor import XoColor +from sugar3.datastore import datastore +from sugar3 import mime +from sugar3 import env +from sugar3.activity.i18n import pgettext from jarabe.frame import clipboard from jarabe.journal import misc diff --git a/src/jarabe/frame/clipboardobject.py b/src/jarabe/frame/clipboardobject.py index df3f2ac..a91c672 100644 --- a/src/jarabe/frame/clipboardobject.py +++ b/src/jarabe/frame/clipboardobject.py @@ -21,8 +21,8 @@ from gi.repository import Gio from gi.repository import Gtk from gettext import gettext as _ -from sugar import mime -from sugar.bundle.activitybundle import ActivityBundle +from sugar3 import mime +from sugar3.bundle.activitybundle import ActivityBundle class ClipboardObject(object): diff --git a/src/jarabe/frame/clipboardtray.py b/src/jarabe/frame/clipboardtray.py index 4edc1c0..7973ee2 100644 --- a/src/jarabe/frame/clipboardtray.py +++ b/src/jarabe/frame/clipboardtray.py @@ -18,8 +18,8 @@ import logging from gi.repository import Gtk -from sugar.graphics import tray -from sugar.graphics import style +from sugar3.graphics import tray +from sugar3.graphics import style from jarabe.frame import clipboard from jarabe.frame.clipboardicon import ClipboardIcon diff --git a/src/jarabe/frame/devicestray.py b/src/jarabe/frame/devicestray.py index c5db639..f3bdbab 100644 --- a/src/jarabe/frame/devicestray.py +++ b/src/jarabe/frame/devicestray.py @@ -17,7 +17,7 @@ import os import logging -from sugar.graphics import tray +from sugar3.graphics import tray from jarabe import config diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py index cafa343..94a5a0f 100644 --- a/src/jarabe/frame/frame.py +++ b/src/jarabe/frame/frame.py @@ -19,10 +19,10 @@ import logging from gi.repository import Gtk from gi.repository import GObject -from sugar.graphics import animator -from sugar.graphics import style -from sugar.graphics import palettegroup -from sugar import profile +from sugar3.graphics import animator +from sugar3.graphics import style +from sugar3.graphics import palettegroup +from sugar3 import profile from jarabe.frame.eventarea import EventArea from jarabe.frame.activitiestray import ActivitiesTray diff --git a/src/jarabe/frame/frameinvoker.py b/src/jarabe/frame/frameinvoker.py index 4aef631..2ae7620 100644 --- a/src/jarabe/frame/frameinvoker.py +++ b/src/jarabe/frame/frameinvoker.py @@ -16,8 +16,8 @@ from gi.repository import Gtk -from sugar.graphics import style -from sugar.graphics.palette import WidgetInvoker +from sugar3.graphics import style +from sugar3.graphics.palette import WidgetInvoker def _get_screen_area(): diff --git a/src/jarabe/frame/framewindow.py b/src/jarabe/frame/framewindow.py index a4e4fc8..ada015a 100644 --- a/src/jarabe/frame/framewindow.py +++ b/src/jarabe/frame/framewindow.py @@ -18,7 +18,7 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject -from sugar.graphics import style +from sugar3.graphics import style class FrameContainer(Gtk.Bin): diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py index eaae1fa..00d951f 100644 --- a/src/jarabe/frame/friendstray.py +++ b/src/jarabe/frame/friendstray.py @@ -16,7 +16,7 @@ import logging -from sugar.graphics.tray import VTray, TrayIcon +from sugar3.graphics.tray import VTray, TrayIcon from jarabe.view.buddymenu import BuddyMenu from jarabe.frame.frameinvoker import FrameWidgetInvoker diff --git a/src/jarabe/frame/notification.py b/src/jarabe/frame/notification.py index a9f3863..bc05467 100644 --- a/src/jarabe/frame/notification.py +++ b/src/jarabe/frame/notification.py @@ -17,8 +17,8 @@ from gi.repository import GObject from gi.repository import Gtk -from sugar.graphics import style -from sugar.graphics.xocolor import XoColor +from sugar3.graphics import style +from sugar3.graphics.xocolor import XoColor from jarabe.view.pulsingicon import PulsingIcon diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py index 4d72a25..405870a 100644 --- a/src/jarabe/frame/zoomtoolbar.py +++ b/src/jarabe/frame/zoomtoolbar.py @@ -22,9 +22,9 @@ import glib from gi.repository import Gtk from gi.repository import GObject -from sugar.graphics import style -from sugar.graphics.palette import Palette -from sugar.graphics.radiotoolbutton import RadioToolButton +from sugar3.graphics import style +from sugar3.graphics.palette import Palette +from sugar3.graphics.radiotoolbutton import RadioToolButton from jarabe.frame.frameinvoker import FrameWidgetInvoker from jarabe.model import shell diff --git a/src/jarabe/intro/__init__.py b/src/jarabe/intro/__init__.py index 163e16b..d2e9276 100644 --- a/src/jarabe/intro/__init__.py +++ b/src/jarabe/intro/__init__.py @@ -2,8 +2,8 @@ import os from gi.repository import Gtk -from sugar import env -from sugar.profile import get_profile +from sugar3 import env +from sugar3.profile import get_profile from jarabe.intro.window import IntroWindow from jarabe.intro.window import create_profile diff --git a/src/jarabe/intro/colorpicker.py b/src/jarabe/intro/colorpicker.py index 2884517..bc52d24 100644 --- a/src/jarabe/intro/colorpicker.py +++ b/src/jarabe/intro/colorpicker.py @@ -16,9 +16,9 @@ from gi.repository import Gtk -from sugar.graphics.icon import Icon -from sugar.graphics import style -from sugar.graphics.xocolor import XoColor +from sugar3.graphics.icon import Icon +from sugar3.graphics import style +from sugar3.graphics.xocolor import XoColor class ColorPicker(Gtk.EventBox): diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py index 8c76083..6d55ab5 100644 --- a/src/jarabe/intro/window.py +++ b/src/jarabe/intro/window.py @@ -24,11 +24,11 @@ import pwd from gi.repository import Gtk from gi.repository import GObject -from sugar import env -from sugar import profile -from sugar.graphics import style -from sugar.graphics.icon import Icon -from sugar.graphics.xocolor import XoColor +from sugar3 import env +from sugar3 import profile +from sugar3.graphics import style +from sugar3.graphics.icon import Icon +from sugar3.graphics.xocolor import XoColor from jarabe.intro import colorpicker diff --git a/src/jarabe/journal/detailview.py b/src/jarabe/journal/detailview.py index fc4c31a..1c5fad0 100644 --- a/src/jarabe/journal/detailview.py +++ b/src/jarabe/journal/detailview.py @@ -20,8 +20,8 @@ from gettext import gettext as _ from gi.repository import GObject from gi.repository import Gtk -from sugar.graphics import style -from sugar.graphics.icon import Icon +from sugar3.graphics import style +from sugar3.graphics.icon import Icon from jarabe.journal.expandedentry import ExpandedEntry from jarabe.journal import model diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py index d3d2bad..3bfe013 100644 --- a/src/jarabe/journal/expandedentry.py +++ b/src/jarabe/journal/expandedentry.py @@ -26,9 +26,9 @@ import glib from gi.repository import Gtk import simplejson -from sugar.graphics import style -from sugar.graphics.xocolor import XoColor -from sugar.util import format_size +from sugar3.graphics import style +from sugar3.graphics.xocolor import XoColor +from sugar3.util import format_size from jarabe.journal.keepicon import KeepIcon from jarabe.journal.palettes import ObjectPalette, BuddyPalette diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py index 309c6a7..ef26fe8 100644 --- a/src/jarabe/journal/journalactivity.py +++ b/src/jarabe/journal/journalactivity.py @@ -24,13 +24,13 @@ import dbus import statvfs import os -from sugar.graphics.window import Window -from sugar.graphics.alert import ErrorAlert +from sugar3.graphics.window import Window +from sugar3.graphics.alert import ErrorAlert -from sugar.bundle.bundle import ZipExtractException, RegistrationException -from sugar import env -from sugar.activity import activityfactory -from sugar import wm +from sugar3.bundle.bundle import ZipExtractException, RegistrationException +from sugar3 import env +from sugar3.activity import activityfactory +from sugar3 import wm from jarabe.model import bundleregistry from jarabe.journal.journaltoolbox import MainToolbox, DetailToolbox diff --git a/src/jarabe/journal/journalentrybundle.py b/src/jarabe/journal/journalentrybundle.py index c220c09..87ae74b 100644 --- a/src/jarabe/journal/journalentrybundle.py +++ b/src/jarabe/journal/journalentrybundle.py @@ -21,7 +21,7 @@ import shutil import simplejson import dbus -from sugar.bundle.bundle import Bundle, MalformedBundleException +from sugar3.bundle.bundle import Bundle, MalformedBundleException from jarabe.journal import model diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py index ab6294e..d688250 100644 --- a/src/jarabe/journal/journaltoolbox.py +++ b/src/jarabe/journal/journaltoolbox.py @@ -27,18 +27,18 @@ from gi.repository import Gio import glib from gi.repository import Gtk -from sugar.graphics.palette import Palette -from sugar.graphics.toolbarbox import ToolbarBox -from sugar.graphics.toolcombobox import ToolComboBox -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.toggletoolbutton import ToggleToolButton -from sugar.graphics.combobox import ComboBox -from sugar.graphics.menuitem import MenuItem -from sugar.graphics.icon import Icon -from sugar.graphics.xocolor import XoColor -from sugar.graphics.alert import Alert -from sugar.graphics import iconentry -from sugar import mime +from sugar3.graphics.palette import Palette +from sugar3.graphics.toolbarbox import ToolbarBox +from sugar3.graphics.toolcombobox import ToolComboBox +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics.toggletoolbutton import ToggleToolButton +from sugar3.graphics.combobox import ComboBox +from sugar3.graphics.menuitem import MenuItem +from sugar3.graphics.icon import Icon +from sugar3.graphics.xocolor import XoColor +from sugar3.graphics.alert import Alert +from sugar3.graphics import iconentry +from sugar3 import mime from jarabe.model import bundleregistry from jarabe.journal import misc diff --git a/src/jarabe/journal/journalwindow.py b/src/jarabe/journal/journalwindow.py index 31bc790..776a495 100644 --- a/src/jarabe/journal/journalwindow.py +++ b/src/jarabe/journal/journalwindow.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.graphics.window import Window +from sugar3.graphics.window import Window _journal_window = None diff --git a/src/jarabe/journal/keepicon.py b/src/jarabe/journal/keepicon.py index 2b2f069..90d08f4 100644 --- a/src/jarabe/journal/keepicon.py +++ b/src/jarabe/journal/keepicon.py @@ -18,9 +18,9 @@ from gi.repository import Gtk from gi.repository import GConf import logging -from sugar.graphics.icon import Icon -from sugar.graphics import style -from sugar.graphics.xocolor import XoColor +from sugar3.graphics.icon import Icon +from sugar3.graphics import style +from sugar3.graphics.xocolor import XoColor class KeepIcon(Gtk.ToggleButton): diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py index 5ab3671..ad055c6 100644 --- a/src/jarabe/journal/listmodel.py +++ b/src/jarabe/journal/listmodel.py @@ -21,16 +21,16 @@ from gi.repository import GObject from gi.repository import Gtk from gettext import gettext as _ -from sugar.graphics.xocolor import XoColor -from sugar.graphics import style -from sugar import util +from sugar3.graphics.xocolor import XoColor +from sugar3.graphics import style +from sugar3 import util from jarabe.journal import model from jarabe.journal import misc -DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore' -DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore' +DS_DBUS_SERVICE = 'org.laptop.sugar3.DataStore' +DS_DBUS_INTERFACE = 'org.laptop.sugar3.DataStore' DS_DBUS_PATH = '/org/laptop/sugar/DataStore' diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py index f1e96cf..bc2e63a 100644 --- a/src/jarabe/journal/listview.py +++ b/src/jarabe/journal/listview.py @@ -24,10 +24,10 @@ from gi.repository import Gtk from gi.repository import GConf from gi.repository import Pango -from sugar.graphics import style -from sugar.graphics.icon import Icon, CellRendererIcon -from sugar.graphics.xocolor import XoColor -from sugar import util +from sugar3.graphics import style +from sugar3.graphics.icon import Icon, CellRendererIcon +from sugar3.graphics.xocolor import XoColor +from sugar3 import util from jarabe.journal.listmodel import ListModel from jarabe.journal.palettes import ObjectPalette, BuddyPalette diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py index ff92d65..cf9d136 100644 --- a/src/jarabe/journal/misc.py +++ b/src/jarabe/journal/misc.py @@ -23,16 +23,16 @@ from gi.repository import Gio from gi.repository import GConf from gi.repository import Gtk -from sugar.activity import activityfactory -from sugar.activity.activityhandle import ActivityHandle -from sugar.graphics.icon import get_icon_file_name -from sugar.graphics.xocolor import XoColor -from sugar.graphics.alert import ConfirmationAlert -from sugar import mime -from sugar.bundle.activitybundle import ActivityBundle -from sugar.bundle.bundle import AlreadyInstalledException -from sugar.bundle.contentbundle import ContentBundle -from sugar import util +from sugar3.activity import activityfactory +from sugar3.activity.activityhandle import ActivityHandle +from sugar3.graphics.icon import get_icon_file_name +from sugar3.graphics.xocolor import XoColor +from sugar3.graphics.alert import ConfirmationAlert +from sugar3 import mime +from sugar3.bundle.activitybundle import ActivityBundle +from sugar3.bundle.bundle import AlreadyInstalledException +from sugar3.bundle.contentbundle import ContentBundle +from sugar3 import util from jarabe.view import launcher from jarabe.model import bundleregistry, shell diff --git a/src/jarabe/journal/modalalert.py b/src/jarabe/journal/modalalert.py index 8b93b21..01482f2 100644 --- a/src/jarabe/journal/modalalert.py +++ b/src/jarabe/journal/modalalert.py @@ -18,9 +18,9 @@ from gi.repository import Gtk from gettext import gettext as _ from gi.repository import GConf -from sugar.graphics.icon import Icon -from sugar.graphics import style -from sugar.graphics.xocolor import XoColor +from sugar3.graphics.icon import Icon +from sugar3.graphics import style +from sugar3.graphics.xocolor import XoColor class ModalAlert(Gtk.Window): diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py index b052542..2378677 100644 --- a/src/jarabe/journal/model.py +++ b/src/jarabe/journal/model.py @@ -33,13 +33,13 @@ import dbus from gi.repository import Gio from gi.repository import GConf -from sugar import dispatch -from sugar import mime -from sugar import util +from sugar3 import dispatch +from sugar3 import mime +from sugar3 import util -DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore' -DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore' +DS_DBUS_SERVICE = 'org.laptop.sugar3.DataStore' +DS_DBUS_INTERFACE = 'org.laptop.sugar3.DataStore' DS_DBUS_PATH = '/org/laptop/sugar/DataStore' # Properties the journal cares about. diff --git a/src/jarabe/journal/objectchooser.py b/src/jarabe/journal/objectchooser.py index c830005..6d333c6 100644 --- a/src/jarabe/journal/objectchooser.py +++ b/src/jarabe/journal/objectchooser.py @@ -21,8 +21,8 @@ from gi.repository import GObject from gi.repository import Gtk from gi.repository import Wnck -from sugar.graphics import style -from sugar.graphics.toolbutton import ToolButton +from sugar3.graphics import style +from sugar3.graphics.toolbutton import ToolButton from jarabe.journal.listview import BaseListView from jarabe.journal.listmodel import ListModel diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py index 01743d6..5ef880b 100644 --- a/src/jarabe/journal/palettes.py +++ b/src/jarabe/journal/palettes.py @@ -24,13 +24,13 @@ from gi.repository import GConf from gi.repository import Gio import glib -from sugar.graphics import style -from sugar.graphics.palette import Palette -from sugar.graphics.menuitem import MenuItem -from sugar.graphics.icon import Icon -from sugar.graphics.xocolor import XoColor -from sugar.graphics.alert import Alert -from sugar import mime +from sugar3.graphics import style +from sugar3.graphics.palette import Palette +from sugar3.graphics.menuitem import MenuItem +from sugar3.graphics.icon import Icon +from sugar3.graphics.xocolor import XoColor +from sugar3.graphics.alert import Alert +from sugar3 import mime from jarabe.model import friends from jarabe.model import filetransfer diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py index f75dd61..f22beff 100644 --- a/src/jarabe/journal/volumestoolbar.py +++ b/src/jarabe/journal/volumestoolbar.py @@ -30,10 +30,10 @@ import simplejson import tempfile import shutil -from sugar.graphics.radiotoolbutton import RadioToolButton -from sugar.graphics.palette import Palette -from sugar.graphics.xocolor import XoColor -from sugar import env +from sugar3.graphics.radiotoolbutton import RadioToolButton +from sugar3.graphics.palette import Palette +from sugar3.graphics.xocolor import XoColor +from sugar3 import env from jarabe.journal import model from jarabe.view.palettes import VolumePalette diff --git a/src/jarabe/model/adhoc.py b/src/jarabe/model/adhoc.py index eda7c83..dfd6caa 100644 --- a/src/jarabe/model/adhoc.py +++ b/src/jarabe/model/adhoc.py @@ -21,7 +21,7 @@ from gi.repository import GObject from jarabe.model import network from jarabe.model.network import Settings -from sugar.util import unique_id +from sugar3.util import unique_id from jarabe.model.network import IP4Config diff --git a/src/jarabe/model/buddy.py b/src/jarabe/model/buddy.py index 33d8948..4c26468 100644 --- a/src/jarabe/model/buddy.py +++ b/src/jarabe/model/buddy.py @@ -23,8 +23,8 @@ import dbus from telepathy.client import Connection from telepathy.interfaces import CONNECTION -from sugar.graphics.xocolor import XoColor -from sugar.profile import get_profile +from sugar3.graphics.xocolor import XoColor +from sugar3.profile import get_profile from jarabe.util.telepathy import connection_watcher diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py index d790410..cec831f 100644 --- a/src/jarabe/model/bundleregistry.py +++ b/src/jarabe/model/bundleregistry.py @@ -23,13 +23,13 @@ from gi.repository import GObject from gi.repository import Gio import simplejson -from sugar.bundle.activitybundle import ActivityBundle -from sugar.bundle.contentbundle import ContentBundle -from sugar.bundle.bundleversion import NormalizedVersion +from sugar3.bundle.activitybundle import ActivityBundle +from sugar3.bundle.contentbundle import ContentBundle +from sugar3.bundle.bundleversion import NormalizedVersion from jarabe.journal.journalentrybundle import JournalEntryBundle -from sugar.bundle.bundle import MalformedBundleException, \ +from sugar3.bundle.bundle import MalformedBundleException, \ AlreadyInstalledException, RegistrationException -from sugar import env +from sugar3 import env from jarabe import config from jarabe.model import mimeregistry diff --git a/src/jarabe/model/filetransfer.py b/src/jarabe/model/filetransfer.py index c73625d..820df74 100644 --- a/src/jarabe/model/filetransfer.py +++ b/src/jarabe/model/filetransfer.py @@ -27,8 +27,8 @@ from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT, \ SOCKET_ACCESS_CONTROL_LOCALHOST from telepathy.client import Connection, Channel -from sugar.presence import presenceservice -from sugar import dispatch +from sugar3.presence import presenceservice +from sugar3 import dispatch from jarabe.util.telepathy import connection_watcher from jarabe.model import neighborhood diff --git a/src/jarabe/model/friends.py b/src/jarabe/model/friends.py index 101de51..6807429 100644 --- a/src/jarabe/model/friends.py +++ b/src/jarabe/model/friends.py @@ -21,8 +21,8 @@ from ConfigParser import ConfigParser from gi.repository import GObject import dbus -from sugar import env -from sugar.graphics.xocolor import XoColor +from sugar3 import env +from sugar3.graphics.xocolor import XoColor from jarabe.model.buddy import BuddyModel from jarabe.model import neighborhood diff --git a/src/jarabe/model/invites.py b/src/jarabe/model/invites.py index 2d897ce..7c9abe9 100644 --- a/src/jarabe/model/invites.py +++ b/src/jarabe/model/invites.py @@ -30,7 +30,7 @@ from telepathy.interfaces import CHANNEL, \ CLIENT from telepathy.constants import HANDLE_TYPE_ROOM -from sugar.graphics.xocolor import XoColor +from sugar3.graphics.xocolor import XoColor from jarabe.model import telepathyclient from jarabe.model import bundleregistry diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py index 99845a0..96b489e 100644 --- a/src/jarabe/model/neighborhood.py +++ b/src/jarabe/model/neighborhood.py @@ -42,8 +42,8 @@ from telepathy.constants import HANDLE_TYPE_CONTACT, \ CONNECTION_STATUS_DISCONNECTED from telepathy.client import Connection, Channel -from sugar.graphics.xocolor import XoColor -from sugar.profile import get_profile +from sugar3.graphics.xocolor import XoColor +from sugar3.profile import get_profile from jarabe.model.buddy import BuddyModel, get_owner_instance from jarabe.model import bundleregistry diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index b513c16..56d98b6 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -29,9 +29,9 @@ import ConfigParser from gi.repository import GConf import ctypes -from sugar import dispatch -from sugar import env -from sugar.util import unique_id +from sugar3 import dispatch +from sugar3 import env +from sugar3.util import unique_id NM_STATE_UNKNOWN = 0 NM_STATE_ASLEEP = 10 diff --git a/src/jarabe/model/notifications.py b/src/jarabe/model/notifications.py index ec14056..21050b5 100644 --- a/src/jarabe/model/notifications.py +++ b/src/jarabe/model/notifications.py @@ -19,7 +19,7 @@ import logging import dbus -from sugar import dispatch +from sugar3 import dispatch from jarabe import config diff --git a/src/jarabe/model/olpcmesh.py b/src/jarabe/model/olpcmesh.py index cd38740..c2a81f5 100644 --- a/src/jarabe/model/olpcmesh.py +++ b/src/jarabe/model/olpcmesh.py @@ -22,7 +22,7 @@ from gi.repository import GObject from jarabe.model import network from jarabe.model.network import Settings from jarabe.model.network import OlpcMesh as OlpcMeshSettings -from sugar.util import unique_id +from sugar3.util import unique_id _XS_ANYCAST = '\xc0\x27\xc0\x27\xc0\x00' diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py index 38cc540..a5cd4a4 100644 --- a/src/jarabe/model/session.py +++ b/src/jarabe/model/session.py @@ -21,8 +21,8 @@ import signal import sys import logging -from sugar import session -from sugar import env +from sugar3 import session +from sugar3 import env _session_manager = None diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index 01379d8..e015c8a 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -24,9 +24,9 @@ from gi.repository import GObject from gi.repository import Gtk import dbus -from sugar import wm -from sugar import dispatch -from sugar.graphics.xocolor import XoColor +from sugar3 import wm +from sugar3 import dispatch +from sugar3.graphics.xocolor import XoColor from jarabe.model.bundleregistry import get_registry @@ -42,7 +42,7 @@ class Activity(GObject.GObject): This class stores the Sugar Shell's metadata regarding a given activity/application in the system. It interacts with - the sugar.activity.* modules extensively in order to + the sugar3.activity.* modules extensively in order to accomplish its tasks. """ @@ -55,7 +55,7 @@ class Activity(GObject.GObject): def __init__(self, activity_info, activity_id, color, window=None): """Initialise the HomeActivity - activity_info -- sugar.activity.registry.ActivityInfo instance, + activity_info -- sugar3.activity.registry.ActivityInfo instance, provides the information required to actually create the new instance. This is, in effect, the "type" of activity being created. @@ -164,7 +164,7 @@ class Activity(GObject.GObject): """Retrieve the "activity_id" passed in to our constructor This is a "globally likely unique" identifier generated by - sugar.util.unique_id + sugar3.util.unique_id """ return self._activity_id diff --git a/src/jarabe/model/sound.py b/src/jarabe/model/sound.py index e1d8878..4fc5a48 100644 --- a/src/jarabe/model/sound.py +++ b/src/jarabe/model/sound.py @@ -16,9 +16,9 @@ from gi.repository import GConf -from sugar import env +from sugar3 import env from gi.repository import SugarExt -from sugar import dispatch +from sugar3 import dispatch VOLUME_STEP = 10 diff --git a/src/jarabe/model/telepathyclient.py b/src/jarabe/model/telepathyclient.py index 2604af6..ace45d5 100644 --- a/src/jarabe/model/telepathyclient.py +++ b/src/jarabe/model/telepathyclient.py @@ -29,7 +29,7 @@ from telepathy.server import DBusProperties from telepathy.constants import CONNECTION_HANDLE_TYPE_ROOM from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT -from sugar import dispatch +from sugar3 import dispatch SUGAR_CLIENT_SERVICE = 'org.freedesktop.Telepathy.Client.Sugar' diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py index a8d5f00..2c37598 100644 --- a/src/jarabe/util/emulator.py +++ b/src/jarabe/util/emulator.py @@ -25,7 +25,7 @@ from gettext import gettext as _ from gi.repository import Gtk from gi.repository import GObject -from sugar import env +from sugar3 import env ERROR_NO_DISPLAY = 30 diff --git a/src/jarabe/view/buddyicon.py b/src/jarabe/view/buddyicon.py index e84e881..e024dcb 100644 --- a/src/jarabe/view/buddyicon.py +++ b/src/jarabe/view/buddyicon.py @@ -14,8 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar.graphics import style -from sugar.graphics.palette import Palette +from sugar3.graphics import style +from sugar3.graphics.palette import Palette from jarabe.view.buddymenu import BuddyMenu from jarabe.view.eventicon import EventIcon diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py index 8fd54cf..d607cea 100644 --- a/src/jarabe/view/buddymenu.py +++ b/src/jarabe/view/buddymenu.py @@ -23,9 +23,9 @@ from gi.repository import GConf import glib import dbus -from sugar.graphics.palette import Palette -from sugar.graphics.menuitem import MenuItem -from sugar.graphics.icon import Icon +from sugar3.graphics.palette import Palette +from sugar3.graphics.menuitem import MenuItem +from sugar3.graphics.icon import Icon from jarabe.model import shell from jarabe.model import friends diff --git a/src/jarabe/view/customizebundle.py b/src/jarabe/view/customizebundle.py index 3e94def..92dcb56 100644 --- a/src/jarabe/view/customizebundle.py +++ b/src/jarabe/view/customizebundle.py @@ -20,10 +20,10 @@ import hashlib from gi.repository import Gtk -from sugar import profile -from sugar.activity import bundlebuilder -from sugar.datastore import datastore -from sugar.env import get_user_activities_path +from sugar3 import profile +from sugar3.activity import bundlebuilder +from sugar3.datastore import datastore +from sugar3.env import get_user_activities_path import logging _logger = logging.getLogger('ViewSource') diff --git a/src/jarabe/view/eventicon.py b/src/jarabe/view/eventicon.py index c4da237..867b707 100644 --- a/src/jarabe/view/eventicon.py +++ b/src/jarabe/view/eventicon.py @@ -17,10 +17,10 @@ from gi.repository import GObject from gi.repository import Gtk -from sugar.graphics import style -from sugar.graphics.icon import _IconBuffer -from sugar.graphics.palette import Palette -from sugar.graphics.palettewindow import Invoker +from sugar3.graphics import style +from sugar3.graphics.icon import _IconBuffer +from sugar3.graphics.palette import Palette +from sugar3.graphics.palettewindow import Invoker class CursorInvoker(Invoker): diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py index 4d67db7..3b5a64c 100644 --- a/src/jarabe/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -21,7 +21,7 @@ import logging import dbus from gi.repository import Gtk -from sugar._sugarext import KeyGrabber +from sugar3._sugarext import KeyGrabber from jarabe.model import sound from jarabe.model import shell diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py index 6625df1..838c76b 100644 --- a/src/jarabe/view/launcher.py +++ b/src/jarabe/view/launcher.py @@ -20,8 +20,8 @@ from gettext import gettext as _ from gi.repository import Gtk from gi.repository import GObject -from sugar import wm -from sugar.graphics import style +from sugar3 import wm +from sugar3.graphics import style from jarabe.model import shell from jarabe.view.pulsingicon import PulsingIcon diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py index e321221..2d13cbd 100644 --- a/src/jarabe/view/palettes.py +++ b/src/jarabe/view/palettes.py @@ -23,13 +23,13 @@ from gi.repository import GConf import glib from gi.repository import Gtk -from sugar import env -from sugar.graphics.palette import Palette -from sugar.graphics.menuitem import MenuItem -from sugar.graphics.icon import Icon -from sugar.graphics import style -from sugar.graphics.xocolor import XoColor -from sugar.activity.i18n import pgettext +from sugar3 import env +from sugar3.graphics.palette import Palette +from sugar3.graphics.menuitem import MenuItem +from sugar3.graphics.icon import Icon +from sugar3.graphics import style +from sugar3.graphics.xocolor import XoColor +from sugar3.activity.i18n import pgettext from jarabe.model import shell from jarabe.view.viewsource import setup_view_source diff --git a/src/jarabe/view/pulsingicon.py b/src/jarabe/view/pulsingicon.py index 6cecfb5..ef77dee 100644 --- a/src/jarabe/view/pulsingicon.py +++ b/src/jarabe/view/pulsingicon.py @@ -18,8 +18,8 @@ import math from gi.repository import GObject -from sugar.graphics.icon import Icon -from sugar.graphics import style +from sugar3.graphics.icon import Icon +from sugar3.graphics import style from jarabe.view.eventicon import EventIcon diff --git a/src/jarabe/view/viewsource.py b/src/jarabe/view/viewsource.py index 2ab2f3c..b9f5e1c 100644 --- a/src/jarabe/view/viewsource.py +++ b/src/jarabe/view/viewsource.py @@ -29,16 +29,16 @@ from gi.repository import GtkSource import dbus from gi.repository import GConf -from sugar.graphics import style -from sugar.graphics.icon import Icon -from sugar.graphics.xocolor import XoColor -from sugar.graphics.menuitem import MenuItem -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.radiotoolbutton import RadioToolButton -from sugar.bundle.activitybundle import ActivityBundle -from sugar.datastore import datastore -from sugar.env import get_user_activities_path -from sugar import mime +from sugar3.graphics import style +from sugar3.graphics.icon import Icon +from sugar3.graphics.xocolor import XoColor +from sugar3.graphics.menuitem import MenuItem +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics.radiotoolbutton import RadioToolButton +from sugar3.bundle.activitybundle import ActivityBundle +from sugar3.datastore import datastore +from sugar3.env import get_user_activities_path +from sugar3 import mime from jarabe.view import customizebundle |