From 09812f9d4e7c60923920ae7ea3746bd7cbb4b195 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Sat, 05 Nov 2011 19:11:54 +0000
Subject: myriad of small patches to get non-interactive mode working again

---
(limited to 'TurtleArt/tablock.py')

diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index f2d0f62..03ddc05 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -381,8 +381,9 @@ class Block:
             self.width = copy_block.width
             self.height = copy_block.height
             self.shapes[0] = copy_block.shapes[0]
-            self.spr = sprites.Sprite(sprite_list, x, y, self.shapes[0])
-            self.spr._margins = copy_block.spr._margins[:]
+            if sprite_list is not None:
+                self.spr = sprites.Sprite(sprite_list, x, y, self.shapes[0])
+                self.spr._margins = copy_block.spr._margins[:]
             if len(copy_block.shapes) > 1:
                 self.shapes[1] = copy_block.shapes[1]
             self.docks = copy_block.docks[:]
@@ -414,15 +415,19 @@ class Block:
             for i, n in enumerate(block_names[self.name]):
                 self._set_labels(i, n)
 
-        if copy_block is None:
+        if copy_block is None and self.spr is not None:
             if self.spr.label_width() > self.spr.label_safe_width():
                 self.resize()
 
     def _set_margins(self):
+        if self.spr is None:
+            return
         self.spr.set_margins(self.svg.margins[0], self.svg.margins[1],
                              self.svg.margins[2], self.svg.margins[3])
 
     def _set_label_attributes(self):
+        if self.spr is None:
+            return
         if self.name in content_blocks:
             n = len(self.values)
             if n == 0:
@@ -451,6 +456,8 @@ class Block:
                                               True, 'center', 'middle', i)
 
     def _set_labels(self, i, label):
+        if self.spr is None:
+            return
         self.spr.set_label(label, i)
 
     def _make_block(self, svg):
--
cgit v0.9.1