From 695b022046650ae05b4ab6d60e457af207e8d618 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Fri, 06 Jul 2012 23:32:22 +0000
Subject: remove more deprecated blocks

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

diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 066870c..15ebad7 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -3252,7 +3252,7 @@ class TurtleArtWindow():
         elif type(btype) == list:
             btype, value = btype[0], btype[1]
 
-        # Replace old-style sandwich blocks
+        # Replace deprecated sandwich blocks
         if btype == 'sandwichtop_no_label':
             btype = 'sandwichclamp'
             docks = []
@@ -3271,6 +3271,9 @@ class TurtleArtWindow():
         # sandwich top dock[2], currently set to None
         elif btype in ['sandwichbottom', 'sandwichcollapsed']:
             btype = 'vspace'
+        # FIXME: blocks after sandwichtop should be in a sandwich clamp
+        elif btype in ['sandwichtop', 'sandwichtop_no_arm']:
+            btype = 'comment'
 
         # Some blocks can only appear once...
         if btype in ['start', 'hat1', 'hat2']:
--
cgit v0.9.1