From 3a9d89d6812f042600a72e9633e37954f6e08d3b Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Tue, 04 Oct 2011 13:26:28 +0000
Subject: only try to import the datastore when running Sugar #3133

---
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 901c594..cc78f1b 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -44,12 +44,6 @@ DEGTOR = 2 * pi / 360
 
 import locale
 
-try:
-    from sugar.datastore import datastore
-    from sugar import profile
-except ImportError:
-    pass
-
 from taconstants import HORIZONTAL_PALETTE, VERTICAL_PALETTE, BLOCK_SCALE, \
     MEDIA_SHAPES, STATUS_SHAPES, OVERLAY_SHAPES, STRING_OR_NUMBER_ARGS, \
     TOOLBAR_SHAPES, TAB_LAYER, RETURN, OVERLAY_LAYER, CATEGORY_LAYER, \
@@ -124,6 +118,10 @@ class TurtleArtWindow():
             debug_output("bad win type %s" % (type(canvas_window)), False)
 
         if self.running_sugar:
+            # Sugar-specific imports
+            from sugar.datastore import datastore
+            from sugar import profile
+
             self.activity = parent
             self.nick = profile.get_nick_name()
         else:
@@ -852,7 +850,7 @@ class TurtleArtWindow():
             for g in find_group(blk):
                 g.spr.move_relative((int(dx), int(dy)))
                 g.spr.save_xy = g.spr.get_xy()
-                if not self.hw in [XO1]:
+                if self.running_sugar and not self.hw in [XO1]:
                     g.spr.move_relative((self.activity.hadj_value,
                                          self.activity.vadj_value,))
             y += int(h + 3)
@@ -888,7 +886,7 @@ class TurtleArtWindow():
             for g in find_group(b):
                 g.spr.move_relative((dx, dy))
                 g.spr.save_xy = g.spr.get_xy()
-                if not self.hw in [XO1]:
+                if self.running_sugar and not self.hw in [XO1]:
                     g.spr.move_relative((self.activity.hadj_value,
                                          self.activity.vadj_value,))
             x += int(w + 4)
@@ -916,7 +914,7 @@ class TurtleArtWindow():
                                        w, PALETTE_HEIGHT, regenerate)
                 self.palette_button[2].move((w - 20, self.toolbar_offset))
                 self.palette_button[2].save_xy = self.palette_button[2].get_xy()
-                if not self.hw in [XO1]:
+                if self.running_sugar and not self.hw in [XO1]:
                     self.palette_button[2].move_relative(
                         (self.activity.hadj_value, self.activity.vadj_value))
             else:
@@ -931,7 +929,7 @@ class TurtleArtWindow():
                 self.palette_button[2].move((PALETTE_WIDTH - 20,
                                              self.toolbar_offset))
                 self.palette_button[2].save_xy = self.palette_button[2].get_xy()
-                if not self.hw in [XO1]:
+                if self.running_sugar and not self.hw in [XO1]:
                     self.palette_button[2].move_relative(
                         (self.activity.hadj_value, self.activity.vadj_value))
             self.palette_sprs[n][self.orientation].set_layer(CATEGORY_LAYER)
@@ -947,7 +945,7 @@ class TurtleArtWindow():
                 Sprite(self.sprite_list, x, y, svg_str_to_pixbuf(
                     svg.palette(w, h)))
             self.palette_sprs[n][self.orientation].save_xy = (x, y)
-            if not self.hw in [XO1]:
+            if self.running_sugar and not self.hw in [XO1]:
                 self.palette_sprs[n][self.orientation].move_relative(
                     (self.activity.hadj_value, self.activity.vadj_value))
             self.palette_sprs[n][self.orientation].type = 'category'
diff --git a/plugins/turtle_blocks_extras/turtle_blocks_extras.py b/plugins/turtle_blocks_extras/turtle_blocks_extras.py
index 831eb3c..a142d78 100644
--- a/plugins/turtle_blocks_extras/turtle_blocks_extras.py
+++ b/plugins/turtle_blocks_extras/turtle_blocks_extras.py
@@ -20,11 +20,6 @@ from time import time
 import os.path
 from gettext import gettext as _
 
-try:
-    from sugar.datastore import datastore
-except ImportError:
-    pass
-
 from plugins.plugin import Plugin
 from TurtleArt.tapalette import make_palette, define_logo_function
 from TurtleArt.talogo import primitive_dictionary, logoerror, \
@@ -936,6 +931,7 @@ bullets'))
                n[6:].lower not in media_blocks_dictionary:
                 try:
                     if self.tw.running_sugar:
+                        from sugar.datastore import datastore
                         try:
                             dsobject = datastore.get(n[6:])
                         except:
--
cgit v0.9.1