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>

20 files changed, 65 insertions, 65 deletions

diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py
index dbd38ae..6083247 100644
--- a/extensions/cpsection/aboutcomputer/view.py
+++ b/extensions/cpsection/aboutcomputer/view.py
@@ -20,7 +20,7 @@ from gettext import gettext as _
 
 from gi.repository import Gtk
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 from jarabe import config
 from jarabe.controlpanel.sectionview import SectionView
@@ -112,18 +112,18 @@ class AboutComputer(SectionView):
 
         box_sugar = Gtk.HBox(spacing=style.DEFAULT_SPACING)
         label_sugar = Gtk.Label(label=_('Sugar:'))
-        label_sugar.set_alignment(1, 0)
-        label_sugar.modify_fg(Gtk.StateType.NORMAL,
+        label_sugar3.set_alignment(1, 0)
+        label_sugar3.modify_fg(Gtk.StateType.NORMAL,
                               style.COLOR_SELECTION_GREY.get_gdk_color())
-        box_sugar.pack_start(label_sugar, False, True, 0)
+        box_sugar3.pack_start(label_sugar, False, True, 0)
         self._group.add_widget(label_sugar)
-        label_sugar.show()
+        label_sugar3.show()
         label_sugar_ver = Gtk.Label(label=config.version)
         label_sugar_ver.set_alignment(0, 0)
-        box_sugar.pack_start(label_sugar_ver, False, True, 0)
+        box_sugar3.pack_start(label_sugar_ver, False, True, 0)
         label_sugar_ver.show()
         box_software.pack_start(box_sugar, False, True, 0)
-        box_sugar.show()
+        box_sugar3.show()
 
         box_firmware = Gtk.HBox(spacing=style.DEFAULT_SPACING)
         label_firmware = Gtk.Label(label=_('Firmware:'))
diff --git a/extensions/cpsection/aboutme/__init__.py b/extensions/cpsection/aboutme/__init__.py
index 67e1dd5..58c9cb8 100644
--- a/extensions/cpsection/aboutme/__init__.py
+++ b/extensions/cpsection/aboutme/__init__.py
@@ -17,7 +17,7 @@
 from gettext import gettext as _
 from gi.repository import GConf
 
-from sugar.graphics.xocolor import XoColor
+from sugar3.graphics.xocolor import XoColor
 
 CLASS = 'AboutMe'
 ICON = 'module-about_me'
diff --git a/extensions/cpsection/aboutme/view.py b/extensions/cpsection/aboutme/view.py
index 143ec26..480c27a 100644
--- a/extensions/cpsection/aboutme/view.py
+++ b/extensions/cpsection/aboutme/view.py
@@ -19,8 +19,8 @@ from gi.repository import Gtk
 from gi.repository import GObject
 from gettext import gettext as _
 
-from sugar.graphics import style
-from sugar.graphics.xocolor import XoColor, colors
+from sugar3.graphics import style
+from sugar3.graphics.xocolor import XoColor, colors
 
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py
index e800856..7586868 100644
--- a/extensions/cpsection/datetime/view.py
+++ b/extensions/cpsection/datetime/view.py
@@ -18,8 +18,8 @@ from gi.repository import Gtk
 from gi.repository import GObject
 from gettext import gettext as _
 
-from sugar.graphics import style
-from sugar.graphics import iconentry
+from sugar3.graphics import style
+from sugar3.graphics import iconentry
 
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
diff --git a/extensions/cpsection/frame/view.py b/extensions/cpsection/frame/view.py
index 6d314f0..f3b796e 100644
--- a/extensions/cpsection/frame/view.py
+++ b/extensions/cpsection/frame/view.py
@@ -18,7 +18,7 @@ from gi.repository import Gtk
 from gi.repository import GObject
 from gettext import gettext as _
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py
index 9f8b5e3..587c530 100644
--- a/extensions/cpsection/keyboard/view.py
+++ b/extensions/cpsection/keyboard/view.py
@@ -21,8 +21,8 @@ from gi.repository import Pango
 import logging
 from gettext import gettext as _
 
-from sugar.graphics import style
-from sugar.graphics.icon import Icon
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon
 
 from jarabe.controlpanel.sectionview import SectionView
 
diff --git a/extensions/cpsection/language/view.py b/extensions/cpsection/language/view.py
index 5c02a0a..ec364e1 100644
--- a/extensions/cpsection/language/view.py
+++ b/extensions/cpsection/language/view.py
@@ -19,8 +19,8 @@ from gi.repository import Gtk
 from gi.repository import GObject
 import gettext
 
-from sugar.graphics import style
-from sugar.graphics.icon import Icon
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon
 
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
diff --git a/extensions/cpsection/modemconfiguration/view.py b/extensions/cpsection/modemconfiguration/view.py
index 62b6099..6b738af 100644
--- a/extensions/cpsection/modemconfiguration/view.py
+++ b/extensions/cpsection/modemconfiguration/view.py
@@ -20,7 +20,7 @@ import logging
 from gi.repository import Gtk
 from gi.repository import GObject
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 from jarabe.controlpanel.sectionview import SectionView
 
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index c1d937e..e994ad6 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -18,7 +18,7 @@ from gi.repository import Gtk
 from gi.repository import GObject
 from gettext import gettext as _
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
diff --git a/extensions/cpsection/power/view.py b/extensions/cpsection/power/view.py
index 987c9a7..715768f 100644
--- a/extensions/cpsection/power/view.py
+++ b/extensions/cpsection/power/view.py
@@ -17,7 +17,7 @@
 from gi.repository import Gtk
 from gettext import gettext as _
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
diff --git a/extensions/cpsection/updater/backends/aslo.py b/extensions/cpsection/updater/backends/aslo.py
index 0273003..c9bcd0f 100644
--- a/extensions/cpsection/updater/backends/aslo.py
+++ b/extensions/cpsection/updater/backends/aslo.py
@@ -54,8 +54,8 @@ import traceback
 
 from gi.repository import Gio
 
-from sugar.bundle.bundleversion import NormalizedVersion
-from sugar.bundle.bundleversion import InvalidVersionError
+from sugar3.bundle.bundleversion import NormalizedVersion
+from sugar3.bundle.bundleversion import InvalidVersionError
 
 from jarabe import config
 
diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py
index 467af0a..584cbd9 100755
--- a/extensions/cpsection/updater/model.py
+++ b/extensions/cpsection/updater/model.py
@@ -30,10 +30,10 @@ import traceback
 from gi.repository import GObject
 from gi.repository import Gio
 
-from sugar import env
-from sugar.datastore import datastore
-from sugar.bundle.activitybundle import ActivityBundle
-from sugar.bundle.bundleversion import NormalizedVersion
+from sugar3 import env
+from sugar3.datastore import datastore
+from sugar3.bundle.activitybundle import ActivityBundle
+from sugar3.bundle.bundleversion import NormalizedVersion
 
 from jarabe.model import bundleregistry
 
diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py
index a51b9b4..df575ed 100644
--- a/extensions/cpsection/updater/view.py
+++ b/extensions/cpsection/updater/view.py
@@ -23,8 +23,8 @@ import logging
 from gi.repository import GObject
 from gi.repository import Gtk
 
-from sugar.graphics import style
-from sugar.graphics.icon import Icon, CellRendererIcon
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon, CellRendererIcon
 
 from jarabe.controlpanel.sectionview import SectionView
 
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
index 66cb490..fa1a40d 100644
--- a/extensions/deviceicon/battery.py
+++ b/extensions/deviceicon/battery.py
@@ -23,11 +23,11 @@ from gi.repository import GObject
 from gi.repository import Gtk
 import dbus
 
-from sugar.graphics import style
-from sugar.graphics.icon import get_icon_state
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics.palette import Palette
-from sugar.graphics.xocolor import XoColor
+from sugar3.graphics import style
+from sugar3.graphics.icon import get_icon_state
+from sugar3.graphics.tray import TrayIcon
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.xocolor import XoColor
 
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index 6c16890..9b3a515 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -31,15 +31,15 @@ from gi.repository import GObject
 from gi.repository import GConf
 import dbus
 
-from sugar.graphics.icon import get_icon_state
-from sugar.graphics import style
-from sugar.graphics.palette import Palette
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.icon import Icon
-from sugar.graphics import xocolor
-from sugar import profile
+from sugar3.graphics.icon import get_icon_state
+from sugar3.graphics import style
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.tray import TrayIcon
+from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.icon import Icon
+from sugar3.graphics import xocolor
+from sugar3 import profile
 
 from jarabe.model import network
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py
index 4e2ed0e..51c1f63 100644
--- a/extensions/deviceicon/speaker.py
+++ b/extensions/deviceicon/speaker.py
@@ -21,12 +21,12 @@ import glib
 from gi.repository import GObject
 from gi.repository import Gtk
 
-from sugar.graphics import style
-from sugar.graphics.icon import get_icon_state, Icon
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics.palette import Palette
-from sugar.graphics.xocolor import XoColor
+from sugar3.graphics import style
+from sugar3.graphics.icon import get_icon_state, Icon
+from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.tray import TrayIcon
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.xocolor import XoColor
 
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.model import sound
diff --git a/extensions/deviceicon/speech.py b/extensions/deviceicon/speech.py
index 019e9fa..d89ad51 100644
--- a/extensions/deviceicon/speech.py
+++ b/extensions/deviceicon/speech.py
@@ -21,12 +21,12 @@ from gi.repository import Gtk
 from gi.repository import GConf
 from gi.repository import GObject
 
-from sugar.graphics.icon import Icon
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics.palette import Palette
-from sugar.graphics.xocolor import XoColor
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics import style
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.tray import TrayIcon
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.xocolor import XoColor
+from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics import style
 
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.model import speech
diff --git a/extensions/deviceicon/touchpad.py b/extensions/deviceicon/touchpad.py
index 3e4c23f..1463be8 100644
--- a/extensions/deviceicon/touchpad.py
+++ b/extensions/deviceicon/touchpad.py
@@ -24,10 +24,10 @@ import glib
 
 import logging
 
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics.xocolor import XoColor
-from sugar.graphics.palette import Palette
-from sugar.graphics import style
+from sugar3.graphics.tray import TrayIcon
+from sugar3.graphics.xocolor import XoColor
+from sugar3.graphics.palette import Palette
+from sugar3.graphics import style
 
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 
diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index a687481..b1c58c4 100644
--- a/extensions/deviceicon/volume.py
+++ b/extensions/deviceicon/volume.py
@@ -22,10 +22,10 @@ from gi.repository import Gio
 from gi.repository import Gtk
 from gi.repository import GConf
 
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics.xocolor import XoColor
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.icon import Icon
+from sugar3.graphics.tray import TrayIcon
+from sugar3.graphics.xocolor import XoColor
+from sugar3.graphics.menuitem import MenuItem
+from sugar3.graphics.icon import Icon
 
 from jarabe.journal import journalactivity
 from jarabe.view.palettes import VolumePalette
diff --git a/extensions/globalkey/screenshot.py b/extensions/globalkey/screenshot.py
index f7c3a84..97a6bab 100644
--- a/extensions/globalkey/screenshot.py
+++ b/extensions/globalkey/screenshot.py
@@ -23,9 +23,9 @@ from gi.repository import Gtk
 from gi.repository import GConf
 import dbus
 
-from sugar.datastore import datastore
-from sugar.graphics import style
-from sugar import env
+from sugar3.datastore import datastore
+from sugar3.graphics import style
+from sugar3 import env
 from jarabe.model import shell
 
 BOUND_KEYS = ['<alt>1', 'Print']