undo damage from fialed merge request

1 files changed, 296 insertions, 247 deletions

diff --git a/pippy_app.py b/pippy_app.py
index 6fa2a83..5277972 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -19,49 +19,55 @@
 
 """Pippy Activity: A simple Python programming activity ."""
 from __future__ import with_statement
-import gtk
 import logging
-import pango
-import vte
 import re
 import os
-import gobject
 import time
+import subprocess
+from random import uniform
+
+from gi.repository import Gtk
+from gi.repository import Gdk
+from gi.repository import GLib
+from gi.repository import Pango
+from gi.repository import Vte
+from gi.repository import GObject
 
 from port.style import font_zoom
 from signal import SIGTERM
 from gettext import gettext as _
 
-from sugar.activity import activity
+from sugar3.activity import activity
+from sugar3.activity.widgets import EditToolbar
+from sugar3.activity.widgets import StopButton
+from sugar3.activity.activity import get_bundle_path
+from sugar3.activity.activity import get_bundle_name
+from sugar3.graphics import style
+
+from jarabe.view.customizebundle import generate_unique_id
+
 from activity import ViewSourceActivity
 from activity import TARGET_TYPE_TEXT
-from sugar.activity.activity import ActivityToolbox
-from sugar.activity.activity import EditToolbar
-from sugar.activity.activity import get_bundle_path
-from sugar.activity.activity import get_bundle_name
-from sugar.graphics import style
-from sugar.graphics.toolbutton import ToolButton
 
 import groupthink.sugar_tools
 import groupthink.gtk_tools
 
+from FileDialog import FileDialog
+
 text_buffer = None
 # magic prefix to use utf-8 source encoding
 PYTHON_PREFIX = """#!/usr/bin/python
 # -*- coding: utf-8 -*-
 """
 
-OLD_TOOLBAR = False
-try:
-    from sugar.graphics.toolbarbox import ToolbarBox 
-    from sugar.graphics.toolbarbox import ToolbarButton
-    from sugar.activity.widgets import StopButton
-except ImportError:
-    OLD_TOOLBAR = True
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.graphics.toolbarbox import ToolbarButton
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.activity.widgets import ActivityToolbarButton
 
 # get screen sizes
-SIZE_X = gtk.gdk.screen_width()
-SIZE_Y = gtk.gdk.screen_height()
+SIZE_X = Gdk.Screen.width()
+SIZE_Y = Gdk.Screen.height()
 
 groupthink_mimetype = 'pickle/groupthink-pippy'
 
@@ -70,23 +76,17 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
     """Pippy Activity as specified in activity.info"""
     def early_setup(self):
         global text_buffer
-        import gtksourceview2
-        text_buffer = gtksourceview2.Buffer()
+        from gi.repository import GtkSource
+        text_buffer = GtkSource.Buffer()
 
     def initialize_display(self):
         self._logger = logging.getLogger('pippy-activity')
 
         # Activity toolbar with title input, share button and export buttons:
 
-        if OLD_TOOLBAR:
-            activity_toolbar = self.toolbox.get_activity_toolbar()
-        else:
-            activity_toolbar = self.activity_button.page
-
-        # Hide keep button for Sugar versions prior to 0.94:
-        activity_toolbar.keep.hide()
+        activity_toolbar = self.activity_button.page
 
-        separator = gtk.SeparatorToolItem()
+        separator = Gtk.SeparatorToolItem()
         separator.show()
         activity_toolbar.insert(separator, -1)
 
@@ -108,19 +108,13 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
         create_bundle_button.show()
         activity_toolbar.insert(create_bundle_button, -1)
 
-        self._edit_toolbar = activity.EditToolbar()
+        self._edit_toolbar = EditToolbar()
 
-        if OLD_TOOLBAR:
-            activity_toolbar = gtk.Toolbar()
-            self.toolbox.add_toolbar(_('Actions'), activity_toolbar)
-            self.toolbox.set_current_toolbar(1)
-            self.toolbox.add_toolbar(_('Edit'), self._edit_toolbar)
-        else:
-            edit_toolbar_button = ToolbarButton()
-            edit_toolbar_button.set_page(self._edit_toolbar)
-            edit_toolbar_button.props.icon_name = 'toolbar-edit'
-            edit_toolbar_button.props.label = _('Edit')
-            self.get_toolbar_box().toolbar.insert(edit_toolbar_button, -1)
+        edit_toolbar_button = ToolbarButton()
+        edit_toolbar_button.set_page(self._edit_toolbar)
+        edit_toolbar_button.props.icon_name = 'toolbar-edit'
+        edit_toolbar_button.props.label = _('Edit')
+        self.get_toolbar_box().toolbar.insert(edit_toolbar_button, -1)
 
         self._edit_toolbar.show()
 
@@ -129,85 +123,76 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
         self._edit_toolbar.copy.connect('clicked', self.__copybutton_cb)
         self._edit_toolbar.paste.connect('clicked', self.__pastebutton_cb)
 
-        if OLD_TOOLBAR:
-            actions_toolbar = activity_toolbar
-        else:
-            actions_toolbar = self.get_toolbar_box().toolbar
+        actions_toolbar = self.get_toolbar_box().toolbar
 
         # The "go" button
-        goicon_bw = gtk.Image()
+        goicon_bw = Gtk.Image()
         goicon_bw.set_from_file("%s/icons/run_bw.svg" % os.getcwd())
-        goicon_color = gtk.Image()
+        goicon_color = Gtk.Image()
         goicon_color.set_from_file("%s/icons/run_color.svg" % os.getcwd())
         gobutton = ToolButton(label=_("Run!"))
         gobutton.props.accelerator = _('<alt>r')
         gobutton.set_icon_widget(goicon_bw)
         gobutton.set_tooltip(_("Run!"))
-        gobutton.connect('clicked', self.flash_cb, dict({'bw': goicon_bw,
-            'color': goicon_color}))
+        gobutton.connect('clicked', self.flash_cb,
+                         dict({'bw': goicon_bw, 'color': goicon_color}))
         gobutton.connect('clicked', self.gobutton_cb)
         actions_toolbar.insert(gobutton, -1)
 
         # The "stop" button
-        stopicon_bw = gtk.Image()
+        stopicon_bw = Gtk.Image()
         stopicon_bw.set_from_file("%s/icons/stopit_bw.svg" % os.getcwd())
-        stopicon_color = gtk.Image()
+        stopicon_color = Gtk.Image()
         stopicon_color.set_from_file("%s/icons/stopit_color.svg" % os.getcwd())
         stopbutton = ToolButton(label=_("Stop"))
         stopbutton.props.accelerator = _('<alt>s')
         stopbutton.set_icon_widget(stopicon_bw)
-        stopbutton.connect('clicked', self.flash_cb, dict({'bw': stopicon_bw,
-            'color': stopicon_color}))
+        stopbutton.connect('clicked', self.flash_cb,
+                           dict({'bw': stopicon_bw,
+                                 'color': stopicon_color}))
         stopbutton.connect('clicked', self.stopbutton_cb)
         stopbutton.set_tooltip(_("Stop"))
         actions_toolbar.insert(stopbutton, -1)
 
         # The "clear" button
-        clearicon_bw = gtk.Image()
+        clearicon_bw = Gtk.Image()
         clearicon_bw.set_from_file("%s/icons/eraser_bw.svg" % os.getcwd())
-        clearicon_color = gtk.Image()
+        clearicon_color = Gtk.Image()
         clearicon_color.set_from_file("%s/icons/eraser_color.svg" %
                                       os.getcwd())
         clearbutton = ToolButton(label=_("Clear"))
         clearbutton.props.accelerator = _('<alt>c')
         clearbutton.set_icon_widget(clearicon_bw)
         clearbutton.connect('clicked', self.clearbutton_cb)
-        clearbutton.connect('clicked', self.flash_cb, dict({'bw': clearicon_bw,
-            'color': clearicon_color}))
+        clearbutton.connect('clicked', self.flash_cb,
+                            dict({'bw': clearicon_bw,
+                                  'color': clearicon_color}))
         clearbutton.set_tooltip(_("Clear"))
         actions_toolbar.insert(clearbutton, -1)
 
         activity_toolbar.show()
+        
+        examples = ToolButton("pippy-openoff")
+        examples.set_tooltip(_("Load example"))
+        examples.connect("clicked", self.load_example)
+        
+        self.get_toolbar_box().toolbar.insert(Gtk.SeparatorToolItem(), -1)
+        self.get_toolbar_box().toolbar.insert(examples, -1)
+
+        separator = Gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        self.get_toolbar_box().toolbar.insert(separator, -1)
+        separator.show()
 
-        if not OLD_TOOLBAR:
-            separator = gtk.SeparatorToolItem()
-            separator.props.draw = False
-            separator.set_expand(True)
-            self.get_toolbar_box().toolbar.insert(separator, -1)
-            separator.show()
-
-            stop = StopButton(self)
-            self.get_toolbar_box().toolbar.insert(stop, -1)
+        stop = StopButton(self)
+        self.get_toolbar_box().toolbar.insert(stop, -1)
 
         # Main layout.
-        self.hpane = gtk.HPaned()
-        self.vpane = gtk.VPaned()
-
-        # The sidebar.
-        self.sidebar = gtk.VBox()
-        self.model = gtk.TreeStore(gobject.TYPE_PYOBJECT, gobject.TYPE_STRING)
-        treeview = gtk.TreeView(self.model)
-        cellrenderer = gtk.CellRendererText()
-        treecolumn = gtk.TreeViewColumn(_("Examples"), cellrenderer, text=1)
-        treeview.get_selection().connect("changed", self.selection_cb)
-        treeview.append_column(treecolumn)
-        treeview.set_size_request(int(SIZE_X * 0.3), SIZE_Y)
-
-        # Create scrollbars around the view.
-        scrolled = gtk.ScrolledWindow()
-        scrolled.add(treeview)
-        self.sidebar.pack_start(scrolled)
-        self.hpane.add1(self.sidebar)
+        self.vpane = Gtk.Paned.new(orientation=Gtk.Orientation.VERTICAL)
+        self.vpane.set_position(400)  # setting initial position
+
+        self.paths = []
 
         root = os.path.join(get_bundle_path(), 'data')
         for d in sorted(os.listdir(root)):
@@ -215,40 +200,16 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
                 continue  # skip non-dirs
             direntry = {"name": _(d.capitalize()),
                         "path": os.path.join(root, d) + "/"}
-            olditer = self.model.insert_before(None, None)
-            self.model.set_value(olditer, 0, direntry)
-            self.model.set_value(olditer, 1, direntry["name"])
-
-
-            for _file in sorted(os.listdir(os.path.join(root, d))):
-                if _file.endswith('~'):
-                    continue  # skip emacs backups
-                entry = {"name": _(_file.capitalize()),
-                         "path": os.path.join(root, d, _file)}
-                _iter = self.model.insert_before(olditer, None)
-                self.model.set_value(_iter, 0, entry)
-                self.model.set_value(_iter, 1, entry["name"])
-        # Adding local examples 
-        root = os.path.join(os.environ['SUGAR_ACTIVITY_ROOT'],'data')
-        direntry_examples  = { "name": _("My examples"), 
-                               "path": root + "/" }
-        self.example_iter = self.model.insert_before(None, None) 
-        self.model.set_value(self.example_iter, 0, direntry_examples) 
-        self.model.set_value(self.example_iter, 1, direntry_examples["name"]) 
-        for _file in sorted(os.listdir(root)):
-            file_name = os.path.join(root, _file)
-            if os.path.isfile(file_name):
-                entry = {"name": _file, "path": file_name}
-                _iter = self.model.insert_before(self.example_iter, None)
-                self.model.set_value(_iter, 0, entry)
-                self.model.set_value(_iter, 1, entry["name"])
-
-        treeview.expand_all()
+            self.paths.append([direntry['name'], direntry['path']])
+
+        # Adding local examples
+        root = os.path.join(os.environ['SUGAR_ACTIVITY_ROOT'], 'data')
+        self.paths.append([_('My examples'), root])
 
         # Source buffer
-        import gtksourceview2
+        from gi.repository import GtkSource
         global text_buffer
-        lang_manager = gtksourceview2.language_manager_get_default()
+        lang_manager = GtkSource.LanguageManager.get_default()
         if hasattr(lang_manager, 'list_languages'):
             langs = lang_manager.list_languages()
         else:
@@ -266,58 +227,72 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
             text_buffer.set_highlight_syntax(True)
 
         # The GTK source view window
-        self.text_view = gtksourceview2.View(text_buffer)
+        self.text_view = GtkSource.View()
+        self.text_view.set_buffer(text_buffer)
         self.text_view.set_size_request(0, int(SIZE_Y * 0.5))
         self.text_view.set_editable(True)
         self.text_view.set_cursor_visible(True)
         self.text_view.set_show_line_numbers(True)
-        self.text_view.set_wrap_mode(gtk.WRAP_CHAR)
+        self.text_view.set_wrap_mode(Gtk.WrapMode.CHAR)
         self.text_view.set_insert_spaces_instead_of_tabs(True)
         self.text_view.set_tab_width(2)
         self.text_view.set_auto_indent(True)
-        self.text_view.modify_font(pango.FontDescription("Monospace " +
-            str(font_zoom(style.FONT_SIZE))))
+        self.text_view.modify_font(
+            Pango.FontDescription("Monospace " +
+                                  str(font_zoom(style.FONT_SIZE))))
 
         # We could change the color theme here, if we want to.
-        #mgr = gtksourceview2.style_manager_get_default()
+        #mgr = GtkSource.style_manager_get_default()
         #style_scheme = mgr.get_scheme('kate')
         #self.text_buffer.set_style_scheme(style_scheme)
 
-        codesw = gtk.ScrolledWindow()
-        codesw.set_policy(gtk.POLICY_AUTOMATIC,
-                      gtk.POLICY_AUTOMATIC)
+        codesw = Gtk.ScrolledWindow()
+        codesw.set_policy(Gtk.PolicyType.AUTOMATIC,
+                          Gtk.PolicyType.AUTOMATIC)
         codesw.add(self.text_view)
         self.vpane.add1(codesw)
 
         # An hbox to hold the vte window and its scrollbar.
-        outbox = gtk.HBox()
+        outbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
 
         # The vte python window
-        self._vte = vte.Terminal()
+        self._vte = Vte.Terminal()
         self._vte.set_encoding('utf-8')
         self._vte.set_size(30, 5)
         font = 'Monospace ' + str(font_zoom(style.FONT_SIZE))
-        self._vte.set_font(pango.FontDescription(font))
-        self._vte.set_colors(gtk.gdk.color_parse('#000000'),
-                             gtk.gdk.color_parse('#E7E7E7'),
+        self._vte.set_font(Pango.FontDescription(font))
+        self._vte.set_colors(Gdk.color_parse('#000000'),
+                             Gdk.color_parse('#E7E7E7'),
                              [])
         self._vte.connect('child_exited', self.child_exited_cb)
         self._child_exited_handler = None
-        self._vte.drag_dest_set(gtk.DEST_DEFAULT_ALL,
-                                [("text/plain", 0, TARGET_TYPE_TEXT)],
-                                gtk.gdk.ACTION_COPY)
+
+        # FIXME It does not work because it expects and receives StructMeta
+        # Gtk.TargetEntry
+        #
+        # self._vte.drag_dest_set(Gtk.DestDefaults.ALL,
+        #                        [("text/plain", 0, TARGET_TYPE_TEXT)],
+        #                        Gdk.DragAction.COPY)
+
         self._vte.connect('drag_data_received', self.vte_drop_cb)
-        outbox.pack_start(self._vte)
+        outbox.pack_start(self._vte, True, True, 0)
 
-        outsb = gtk.VScrollbar(self._vte.get_adjustment())
+        outsb = Gtk.Scrollbar(orientation=Gtk.Orientation.VERTICAL)
+        outsb.set_adjustment(self._vte.get_vadjustment())
         outsb.show()
         outbox.pack_start(outsb, False, False, 0)
         self.vpane.add2(outbox)
-        self.hpane.add2(self.vpane)
-        return self.hpane
+        return self.vpane
+
+    def load_example(self, widget):
+        widget.set_icon_name("pippy-openon")
+        dialog = FileDialog(self.paths, self, widget)
+        dialog.run()
+        path = dialog.get_path()
+        if path:
+            self._select_func_cb(path)
 
     def when_shared(self):
-        self.hpane.remove(self.hpane.get_child1())
         global text_buffer
         self.cloud.sharefield = \
             groupthink.gtk_tools.TextBufferSharePoint(text_buffer)
@@ -331,20 +306,48 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
         if targetType == TARGET_TYPE_TEXT:
             self._vte.feed_child(selection.data)
 
-    def selection_cb(self, column):
+    def selection_cb(self, value):
         self.save()
-        model, _iter = column.get_selected()
-        value = model.get_value(_iter, 0)
         self._logger.debug("clicked! %s" % value['path'])
         _file = open(value['path'], 'r')
         lines = _file.readlines()
         global text_buffer
         text_buffer.set_text("".join(lines))
+        text_buffer.set_modified(False)
         self.metadata['title'] = value['name']
         self.stopbutton_cb(None)
         self._reset_vte()
         self.text_view.grab_focus()
 
+    def _select_func_cb(self, path):
+        global text_buffer
+        if text_buffer.get_modified():
+            from sugar3.graphics.alert import ConfirmationAlert
+            alert = ConfirmationAlert()
+            alert.props.title = _('Example selection Warning')
+            alert.props.msg = _('You have modified the currently selected file. \
+Discard changes?')
+            alert.connect('response', self._discard_changes_cb, path)
+            self.add_alert(alert)
+            return False
+        else:
+            values = {}
+            values['name'] = os.path.basename(path)
+            values['path'] = path
+            self.selection_cb(values)
+
+        return False
+
+    def _discard_changes_cb(self, alert, response_id, path):
+        self.remove_alert(alert)
+        if response_id is Gtk.ResponseType.OK:
+            values = {}
+            values['name'] = os.path.basename(path)
+            values['path'] = path
+            self.selection_cb(values)
+            global text_buffer
+            text_buffer.set_modified(False)
+
     def timer_cb(self, button, icons):
         button.set_icon_widget(icons['bw'])
         button.show_all()
@@ -353,12 +356,13 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
     def flash_cb(self, button, icons):
         button.set_icon_widget(icons['color'])
         button.show_all()
-        gobject.timeout_add(400, self.timer_cb, button, icons)
+        GObject.timeout_add(400, self.timer_cb, button, icons)
 
     def clearbutton_cb(self, button):
         self.save()
         global text_buffer
         text_buffer.set_text("")
+        text_buffer.set_modified(False)
         self.metadata['title'] = _('%s Activity') % get_bundle_name()
         self.stopbutton_cb(None)
         self._reset_vte()
@@ -367,7 +371,7 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
     def _write_text_buffer(self, filename):
         global text_buffer
         start, end = text_buffer.get_bounds()
-        text = text_buffer.get_text(start, end)
+        text = text_buffer.get_text(start, end, True)
 
         with open(filename, 'w') as f:
             # write utf-8 coding prefix if there's not already one
@@ -393,11 +397,11 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
 
     def __copybutton_cb(self, button):
         global text_buffer
-        text_buffer.copy_clipboard(gtk.Clipboard())
+        text_buffer.copy_clipboard(Gtk.Clipboard())
 
     def __pastebutton_cb(self, button):
         global text_buffer
-        text_buffer.paste_clipboard(gtk.Clipboard(), None, True)
+        text_buffer.paste_clipboard(Gtk.Clipboard(), None, True)
 
     def gobutton_cb(self, button):
         from shutil import copy2
@@ -405,7 +409,7 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
         self._reset_vte()
 
         # FIXME: We're losing an odd race here
-        # gtk.main_iteration(block=False)
+        # Gtk.main_iteration(block=False)
 
         pippy_app_name = '%s/tmp/pippy_app.py' % self.get_activity_root()
         self._write_text_buffer(pippy_app_name)
@@ -413,17 +417,22 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
         copy2('%s/activity.py' % get_bundle_path(),
               '%s/tmp/activity.py' % self.get_activity_root())
 
-        self._pid = self._vte.fork_command(
-            command="/bin/sh",
-            argv=["/bin/sh", "-c",
-                  "python %s; sleep 1" % pippy_app_name],
-            envv=["PYTHONPATH=%s/library:%s" % (get_bundle_path(),
-                                                os.getenv("PYTHONPATH", ""))],
-            directory=get_bundle_path())
+        self._pid = self._vte.fork_command_full(
+            Vte.PtyFlags.DEFAULT,
+            get_bundle_path(),
+            ["/bin/sh", "-c", "python %s; sleep 1" % pippy_app_name,
+             "PYTHONPATH=%s/library:%s" % (get_bundle_path(),
+                                           os.getenv("PYTHONPATH", ""))],
+            ["PYTHONPATH=%s/library:%s" % (get_bundle_path(),
+                                           os.getenv("PYTHONPATH", ""))],
+            GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+            None,
+            None,)
 
     def stopbutton_cb(self, button):
         try:
-            os.kill(self._pid, SIGTERM)
+            if self._pid is not None:
+                os.kill(self._pid[1], SIGTERM)
         except:
             pass  # process must already be dead.
 
@@ -431,79 +440,82 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
         self.copy()
 
     def _create_bundle_cb(self, __):
-        from shutil import copytree
-        from shutil import copy2
-        from shutil import rmtree
+        from shutil import copytree, copy2, rmtree
         from tempfile import mkdtemp
+
         # get the name of this pippy program.
-        title = self.metadata['title']
+        title = self.metadata['title'].replace('.py', '')
+        title = title.replace('-', '')
         if title == 'Pippy Activity':
-            from sugar.graphics.alert import Alert
-            from sugar.graphics.icon import Icon
+            from sugar3.graphics.alert import Alert
+            from sugar3.graphics.icon import Icon
             alert = Alert()
             alert.props.title = _('Save as Activity Error')
             alert.props.msg = _('Please give your activity a meaningful name '
                                 'before attempting to save it as an activity.')
             ok_icon = Icon(icon_name='dialog-ok')
-            alert.add_button(gtk.RESPONSE_OK, _('Ok'), ok_icon)
+            alert.add_button(Gtk.ResponseType.OK, _('Ok'), ok_icon)
             alert.connect('response', self.dismiss_alert_cb)
             self.add_alert(alert)
             return
+
         self.stopbutton_cb(None)  # try stopping old code first.
         self._reset_vte()
         self._vte.feed(_("Creating activity bundle..."))
         self._vte.feed("\r\n")
-        TMPDIR = 'instance' 
+        TMPDIR = 'instance'
         app_temp = mkdtemp('.activity', 'Pippy',
                            os.path.join(self.get_activity_root(), TMPDIR))
         sourcefile = os.path.join(app_temp, 'xyzzy.py')
         # invoke ourself to build the activity bundle.
+        self._logger.debug('writing out source file: %s' % sourcefile)
+
+        # write out application code
+        self._write_text_buffer(sourcefile)
+
         try:
-            # write out application code
-            self._write_text_buffer(sourcefile)
-            # hook up a callback for when the bundle builder is done.
-            # we can't use gobject.child_watch_add because vte will reap our
-            # children before we can.
-            self._child_exited_handler = \
-                lambda: self.bundle_cb(title, app_temp)
-            # invoke bundle builder
-            self._pid = self._vte.fork_command(
-                command="/usr/bin/python",
-                argv=["/usr/bin/python",
-                      "%s/pippy_app.py" % get_bundle_path(),
-                      '-p', '%s/library' % get_bundle_path(),
-                      '-d', app_temp,
-                      title, sourcefile],
-                directory=app_temp)
-        except:
+            # FIXME: vte invocation was raising errors. Switched to subprocess
+            output = subprocess.check_output(
+                ["/usr/bin/python",
+                 "%s/pippy_app.py" % get_bundle_path(),
+                 '-p', '%s/library' % get_bundle_path(),
+                 '-d', app_temp, title, sourcefile])
+            self._vte.feed(output)
+            self._vte.feed("\r\n")
+            self.bundle_cb(title, app_temp)
+        except subprocess.CalledProcessError:
             rmtree(app_temp, ignore_errors=True)  # clean up!
+            self._vte.feed(_('Save as Activity Error'))
+            self._vte.feed("\r\n")
             raise
 
     def _export_example_cb(self, __):
         # get the name of this pippy program.
         title = self.metadata['title']
         if title == _('Pippy Activity'):
-                 from sugar.graphics.alert import Alert
-                 from sugar.graphics.icon import Icon
-                 alert = Alert()
-                 alert.props.title =_ ('Save as Example Error')
-                 alert.props.msg = _('Please give your activity a meaningful name before attempting to save it as an example.')
-                 ok_icon = Icon(icon_name='dialog-ok')
-                 alert.add_button(gtk.RESPONSE_OK, _('Ok'), ok_icon)
-                 alert.connect('response', self.dismiss_alert_cb)
-                 self.add_alert(alert)
-                 return
-        self.stopbutton_cb(None) # try stopping old code first.
+            from sugar3.graphics.alert import Alert
+            from sugar3.graphics.icon import Icon
+            alert = Alert()
+            alert.props.title = _('Save as Example Error')
+            alert.props.msg = _('Please give your activity a meaningful \
+name before attempting to save it as an example.')
+            ok_icon = Icon(icon_name='dialog-ok')
+            alert.add_button(Gtk.ResponseType.OK, _('Ok'), ok_icon)
+            alert.connect('response', self.dismiss_alert_cb)
+            self.add_alert(alert)
+            return
+        self.stopbutton_cb(None)  # try stopping old code first.
         self._reset_vte()
         self._vte.feed(_("Creating example..."))
         self._vte.feed("\r\n")
-        local_data = os.path.join(os.environ['SUGAR_ACTIVITY_ROOT'],'data')
-        local_file = os.path.join(local_data,title)
+        local_data = os.path.join(os.environ['SUGAR_ACTIVITY_ROOT'], 'data')
+        local_file = os.path.join(local_data, title)
         if os.path.exists(local_file):
-            from sugar.graphics.alert import ConfirmationAlert
+            from sugar3.graphics.alert import ConfirmationAlert
             alert = ConfirmationAlert()
-            alert.props.title =_ ('Save as Example Warning')
-            alert.props.msg = _('This example already exists. Do you want to overwrite it?')
+            alert.props.title = _('Save as Example Warning')
+            alert.props.msg = _('This example already exists. \
+Do you want to overwrite it?')
             alert.connect('response', self.confirmation_alert_cb, local_file)
             self.add_alert(alert)
         else:
@@ -512,7 +524,6 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
                 self._vte.feed(_("Saved as example."))
                 self._vte.feed("\r\n")
                 self.add_to_example_list(local_file)
-                                  
 
     def child_exited_cb(self, *args):
         """Called whenever a child exits.  If there's a handler, run it."""
@@ -522,16 +533,19 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
 
     def bundle_cb(self, title, app_temp):
         """Called when we're done building a bundle for a source file."""
-        from sugar import profile
+        from sugar3 import profile
         from shutil import rmtree
-        from sugar.datastore import datastore
+        from sugar3.datastore import datastore
         try:
             # find the .xo file: were we successful?
-            bundle_file = [f for f in os.listdir(app_temp) \
+            bundle_file = [f for f in os.listdir(app_temp)
                            if f.endswith('.xo')]
             if len(bundle_file) != 1:
                 self._logger.debug("Couldn't find bundle: %s" %
                                    str(bundle_file))
+                self._vte.feed("\r\n")
+                self._vte.feed(_("Error saving activity to journal."))
+                self._vte.feed("\r\n")
                 return  # something went wrong.
             # hand off to journal
             os.chmod(app_temp, 0755)
@@ -545,7 +559,8 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
                 'mime_type': 'application/vnd.olpc-sugar',
             }
             for k, v in metadata.items():
-                jobject.metadata[k] = v  # the dict.update method is missing =(
+                # the dict.update method is missing =(
+                jobject.metadata[k] = v
             jobject.file_path = os.path.join(app_temp, bundle_file[0])
             datastore.write(jobject)
             self._vte.feed("\r\n")
@@ -559,32 +574,31 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
     def dismiss_alert_cb(self, alert, response_id):
         self.remove_alert(alert)
 
-    
-    def confirmation_alert_cb(self, alert, response_id, local_file):  #callback for conf alert
+    def confirmation_alert_cb(self, alert, response_id, local_file):
+        # callback for conf alert
         self.remove_alert(alert)
-        if response_id is gtk.RESPONSE_OK:
-                    self.write_file(local_file)
-                    self._reset_vte()
-                    self._vte.feed(_("Saved as example."))
-                    self._vte.feed("\r\n")
+        if response_id is Gtk.ResponseType.OK:
+            self.write_file(local_file)
+            self._reset_vte()
+            self._vte.feed(_("Saved as example."))
+            self._vte.feed("\r\n")
         else:
-             self._reset_vte()
+            self._reset_vte()
 
-    def add_to_example_list(self,local_file):  # def for add example                    
-        entry = { "name": _(os.path.basename(local_file)),
-                  "path": local_file }
+    def add_to_example_list(self, local_file):  # def for add example
+        entry = {"name": _(os.path.basename(local_file)),
+                 "path": local_file}
         _iter = self.model.insert_before(self.example_iter, None)
         self.model.set_value(_iter, 0, entry)
         self.model.set_value(_iter, 1, entry["name"])
-                                    
 
     def save_to_journal(self, file_path, cloudstring):
         _file = open(file_path, 'w')
-        if not self._shared_activity:
+        if not self.shared_activity:
             self.metadata['mime_type'] = 'text/x-python'
             global text_buffer
             start, end = text_buffer.get_bounds()
-            text = text_buffer.get_text(start, end)
+            text = text_buffer.get_text(start, end, True)
             _file.write(text)
         else:
             self.metadata['mime_type'] = groupthink_mimetype
@@ -598,6 +612,7 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
             text = re.sub(r'^' + re.escape(PYTHON_PREFIX), '', text)
             global text_buffer
             text_buffer.set_text(text)
+            text_buffer.set_modified(False)
         elif self.metadata['mime_type'] == groupthink_mimetype:
             return open(file_path).read()
 
@@ -606,8 +621,7 @@ ACTIVITY_INFO_TEMPLATE = """
 [Activity]
 name = %(title)s
 bundle_id = %(bundle_id)s
-service_name = %(bundle_id)s
-class = %(class)s
+exec = sugar-activity %(class)s
 icon = activity-icon
 activity_version = %(version)d
 mime_types = %(mime_types)s
@@ -616,37 +630,68 @@ show_launcher = yes
 """
 
 PIPPY_ICON = \
-"""<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="activity-pippy">
-	<path d="M28.497,48.507   c5.988,0,14.88-2.838,14.88-11.185c0-9.285-7.743-10.143-10.954-11.083c-3.549-0.799-5.913-1.914-6.055-3.455   c-0.243-2.642,1.158-3.671,3.946-3.671c0,0,6.632,3.664,12.266,0.74c1.588-0.823,4.432-4.668,4.432-7.32   c0-2.653-9.181-5.719-11.967-5.719c-2.788,0-5.159,3.847-5.159,3.847c-5.574,0-11.149,5.306-11.149,10.612   c0,5.305,5.333,9.455,11.707,10.612c2.963,0.469,5.441,2.22,4.878,5.438c-0.457,2.613-2.995,5.306-8.361,5.306   c-4.252,0-13.3-0.219-14.745-4.079c-0.929-2.486,0.168-5.205,1.562-5.205l-0.027-0.16c-1.42-0.158-5.548,0.16-5.548,5.465   C8.202,45.452,17.347,48.507,28.497,48.507z" fill="&fill_color;" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
-	<path d="M42.579,19.854c-2.623-0.287-6.611-2-7.467-5.022" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-width="3"/>
-	<circle cx="35.805" cy="10.96" fill="&stroke_color;" r="1.676"/>
+"""<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG
+1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+    <!ENTITY stroke_color "#010101">
+    <!ENTITY fill_color "#FFFFFF">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" version="1.1"
+viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve"
+xmlns="http://www.w3.org/2000/svg"
+xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block"
+id="activity-pippy">
+    <path d="M28.497,48.507   c5.988,0,14.88-2.838,14.88-11.185c0-9.285-7.743-10.143-10.954-11.083c-3.549-0.799-5.913-1.914-6.055-3.455   c-0.243-2.642,1.158-3.671,3.946-3.671c0,0,6.632,3.664,12.266,0.74c1.588-0.823,4.432-4.668,4.432-7.32   c0-2.653-9.181-5.719-11.967-5.719c-2.788,0-5.159,3.847-5.159,3.847c-5.574,0-11.149,5.306-11.149,10.612   c0,5.305,5.333,9.455,11.707,10.612c2.963,0.469,5.441,2.22,4.878,5.438c-0.457,2.613-2.995,5.306-8.361,5.306   c-4.252,0-13.3-0.219-14.745-4.079c-0.929-2.486,0.168-5.205,1.562-5.205l-0.027-0.16c-1.42-0.158-5.548,0.16-5.548,5.465   C8.202,45.452,17.347,48.507,28.497,48.507z" fill="&fill_color;" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+    <path d="M42.579,19.854c-2.623-0.287-6.611-2-7.467-5.022" fill="none"
+stroke="&stroke_color;" stroke-linecap="round" stroke-width="3"/>
+    <circle cx="35.805" cy="10.96" fill="&stroke_color;" r="1.676"/>
 </g></svg><!-- " -->
+
 """
 
 PIPPY_DEFAULT_ICON = \
 """<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
         <!ENTITY ns_svg "http://www.w3.org/2000/svg">
         <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
         <!ENTITY stroke_color "#000000">
         <!ENTITY fill_color "#FFFFFF">
 ]><!--"-->
-<svg  version="1.1" id="Pippy_activity" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="47.585" height="49.326"
-         viewBox="0 0 47.585 49.326" overflow="visible" enable-background="new 0 0 47.585 49.326" xml:space="preserve">
-
+<svg version="1.1" id="Pippy_activity" xmlns="&ns_svg;"
+         xmlns:xlink="&ns_xlink;" width="47.585" height="49.326"
+         viewBox="0 0 47.585 49.326" overflow="visible"
+         enable-background="new 0 0 47.585 49.326"
+         xml:space="preserve">
 <path
-   fill="&fill_color;" stroke="&stroke_color;" stroke-width="2"   d="M 30.689595,16.460324 L 24.320145,12.001708 L 2.7550028,23.830689 L 23.319231,38.662412 L 45.157349,26.742438 L 36.877062,21.100925"   id="path3195" />
+   fill="&fill_color;" stroke="&stroke_color;" stroke-width="2" d="M
+   30.689595,16.460324 L 24.320145,12.001708 L 2.7550028,23.830689 L
+   23.319231,38.662412 L 45.157349,26.742438 L 36.877062,21.100925"
+   id="path3195" />
 <path
    fill="&fill_color;" stroke="&stroke_color;" stroke-width="2"
    nodetypes="cscscssscsssssccc"
-   d="M 12.201296,21.930888 C 13.063838,20.435352 17.035411,18.617621 20.372026,18.965837 C 22.109464,19.147161 24.231003,20.786115 24.317406,21.584638 C 24.401593,22.43057 25.386617,24.647417 26.88611,24.600494 C 28.114098,24.562065 28.61488,23.562481 28.992123,22.444401 C 28.992123,22.444401 28.564434,17.493894 31.897757,15.363536 C 32.836646,14.763482 35.806711,14.411448 37.249047,15.221493 C 38.691382,16.031536 37.648261,19.495598 36.785717,20.991133 C 35.923174,22.48667 32.967872,24.980813 32.967872,24.980813 C 31.242783,27.971884 29.235995,28.5001 26.338769,28.187547 C 23.859153,27.920046 22.434219,26.128159 21.837191,24.708088 C 21.323835,23.487033 20.047743,22.524906 18.388178,22.52176 C 17.218719,22.519542 14.854476,23.017137 16.212763,25.620664 C 16.687174,26.53 18.919175,28.917592 21.08204,29.521929 C 22.919903,30.035455 26.713699,31.223552 30.30027,31.418089 C 26.770532,33.262079 21.760623,32.530604 18.909599,31.658168 C 17.361253,30.887002 9.0350995,26.651992 12.201296,21.930888 z "
+   d="M 12.201296,21.930888 C 13.063838,20.435352 17.035411,18.617621
+   20.372026,18.965837 C 22.109464,19.147161 24.231003,20.786115
+   24.317406,21.584638 C 24.401593,22.43057 25.386617,24.647417
+   26.88611,24.600494 C 28.114098,24.562065 28.61488,23.562481
+   28.992123,22.444401 C 28.992123,22.444401 28.564434,17.493894
+   31.897757,15.363536 C 32.836646,14.763482 35.806711,14.411448
+   37.249047,15.221493 C 38.691382,16.031536 37.648261,19.495598
+   36.785717,20.991133 C 35.923174,22.48667 32.967872,24.980813
+   32.967872,24.980813 C 31.242783,27.971884 29.235995,28.5001
+   26.338769,28.187547 C 23.859153,27.920046 22.434219,26.128159
+   21.837191,24.708088 C 21.323835,23.487033 20.047743,22.524906
+   18.388178,22.52176 C 17.218719,22.519542 14.854476,23.017137
+   16.212763,25.620664 C 16.687174,26.53 18.919175,28.917592
+   21.08204,29.521929 C 22.919903,30.035455 26.713699,31.223552
+   30.30027,31.418089 C 26.770532,33.262079 21.760623,32.530604
+   18.909599,31.658168 C 17.361253,30.887002 9.0350995,26.651992
+   12.201296,21.930888 z "
    id="path2209" />
 <path
    fill="&fill_color;" stroke="&stroke_color;" stroke-width="1"
-   d="M 37.832194,18.895786 C 36.495131,19.851587 34.017797,22.097672 32.3528,21.069911"
+   d="M 37.832194,18.895786 C 36.495131,19.851587 34.017797,22.097672 32.3528,
+      21.069911"
    id="path2211"
    transform-center-y="-3.6171625"
    transform-center-x="-0.50601649" />
@@ -656,7 +701,8 @@ PIPPY_DEFAULT_ICON = \
    cy="6.073"
    r="1.927"
    id="circle2213"
-   transform="matrix(0.269108,-0.4665976,-0.472839,-0.2655557,26.503175,35.608682)"
+   transform="matrix(0.269108,-0.4665976,-0.472839,-0.2655557,26.503175,
+                     35.608682)"
    />
 </svg>
 """
@@ -725,9 +771,10 @@ def main():
     from pyclbr import readmodule_ex
     from tempfile import mkdtemp
     from shutil import copytree, copy2, rmtree
-    from sugar import profile
-    from sugar.activity import bundlebuilder
+    from sugar3 import profile
+    from sugar3.activity import bundlebuilder
     import sys
+
     parser = OptionParser(usage='%prog [options] [title] [sourcefile]')
     parser.add_option('-d', '--dir', dest='dir', default='.', metavar='DIR',
                       help='Put generated bundle in the specified directory.')
@@ -737,11 +784,13 @@ def main():
     (options, args) = parser.parse_args()
     if len(args) != 2:
         parser.error('The title and sourcefile arguments are required.')
+
     title = args[0]
     sourcefile = args[1]
     pytitle = re.sub(r'[^A-Za-z0-9_]', '', title)
     if re.match(r'[0-9]', pytitle) is not None:
         pytitle = '_' + pytitle  # first character cannot be numeric
+
     # first take a gander at the source file and see if it's got extra info
     # for us.
     sourcedir, basename = os.path.split(sourcefile)
@@ -755,12 +804,15 @@ def main():
         'news': 'No news.',
         'icon': PIPPY_DEFAULT_ICON,
         'class': 'activity.VteActivity',
-        'bundle_id': ('org.laptop.pippy.%s' % pytitle),
+        'bundle_id': ('org.sugarlabs.pippy.%s%d' %
+                      (generate_unique_id(),
+                       int(round(uniform(1000, 9999), 0)))),
         'mime_types': '',
         'extra_info': '',
         }
     # are any of these things in the module?
     try_import = False
+
     info = readmodule_ex(module, [sourcedir] + options.path)
     for func in bundle_info.keys():
         p_a_func = 'pippy_activity_%s' % func
@@ -805,28 +857,25 @@ def main():
                 f.write(contents)
         # put script into $app_temp/pippy_app.py
         copy2(sourcefile, '%s/pippy_app.py' % app_temp)
-        # write MANIFEST file.
-        with open('%s/MANIFEST' % app_temp, 'w') as f:
-            for dirpath, dirnames, filenames in sorted(os.walk(app_temp)):
-                for name in sorted(filenames):
-                    fn = os.path.join(dirpath, name)
-                    fn = fn.replace(app_temp + '/', '')
-                    if fn == 'MANIFEST':
-                        continue
-                    f.write('%s\n' % fn)
         # invoke bundle builder
         olddir = os.getcwd()
         oldargv = sys.argv
         os.chdir(app_temp)
         sys.argv = ['setup.py', 'dist_xo']
+        print('\r\nStarting bundlebuilder\r\n')
         bundlebuilder.start()
         sys.argv = oldargv
         os.chdir(olddir)
         # move to destination directory.
-        copy2('%s/dist/%s-%d.xo' % (app_temp, pytitle, bundle_info['version']),
-              '%s/%s-%d.xo' % (options.dir, pytitle, bundle_info['version']))
+        src = '%s/dist/%s-%d.xo' % (app_temp, pytitle, bundle_info['version'])
+        dst = '%s/%s-%d.xo' % (options.dir, pytitle, bundle_info['version'])
+        if not os.path.exists(src):
+            print('Cannot find %s\r\n' % (src))
+        else:
+            copy2(src, dst)
     finally:
         rmtree(app_temp, ignore_errors=True)
+        print('Finally\r\n')
 
 if __name__ == '__main__':
     from gettext import gettext as _
@@ -834,8 +883,8 @@ if __name__ == '__main__':
     if False:  # change this to True to test within Pippy
         sys.argv = sys.argv + ['-d', '/tmp', 'Pippy',
                                '/home/olpc/pippy_app.py']
-    #print _("Working..."),
-    #sys.stdout.flush()
+    print(_("Working..."))
+    sys.stdout.flush()
     main()
-    #print _("done!")
+    print(_("done!"))
     sys.exit(0)