diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-06-29 20:47:40 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-06-29 20:47:40 (GMT) |
| commit | 562908dfee837a30c96030d3cb6b65e39018a694 (patch) | |
| tree | 74b4248ed3b3b23d8f62b452c6a8285f18ce3e8c | |
| parent | b7ffacfce34a4f79f9b7a3a025ed457bf4279378 (diff) | |
| parent | 0450eda17a53d0cac31bf0fd26d56fec2555bcf7 (diff) | |
Merge branch 'master' of git.sugarlabs.org:pippy/mainline
| -rw-r--r-- | activity/activity.info | 2 | ||||
| -rw-r--r-- | pippy_app.py | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/activity/activity.info b/activity/activity.info index a80c958..f13ca16 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,7 +3,7 @@ name = Pippy bundle_id = org.laptop.Pippy exec = sugar-activity pippy_app.PippyActivity icon = activity-icon -activity_version = 48 +activity_version = 49 mime_types = text/x-python, pickle/groupthink-pippy show_launcher = yes license = GPLv2+ diff --git a/pippy_app.py b/pippy_app.py index 24d45fc..6fa2a83 100644 --- a/pippy_app.py +++ b/pippy_app.py @@ -33,9 +33,12 @@ from signal import SIGTERM from gettext import gettext as _ from sugar.activity import activity -from activity import ViewSourceActivity, TARGET_TYPE_TEXT -from sugar.activity.activity import ActivityToolbox, \ - EditToolbar, get_bundle_path, get_bundle_name +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 @@ -50,7 +53,8 @@ PYTHON_PREFIX = """#!/usr/bin/python OLD_TOOLBAR = False try: - from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton + from sugar.graphics.toolbarbox import ToolbarBox + from sugar.graphics.toolbarbox import ToolbarButton from sugar.activity.widgets import StopButton except ImportError: OLD_TOOLBAR = True @@ -427,7 +431,9 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity): self.copy() def _create_bundle_cb(self, __): - from shutil import copytree, copy2, rmtree + from shutil import copytree + from shutil import copy2 + from shutil import rmtree from tempfile import mkdtemp # get the name of this pippy program. title = self.metadata['title'] |