From 4c49dee1049dff9a3e1adfac544c4afe7cbab464 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Fri, 06 Jul 2012 23:38:54 +0000
Subject: remove more deprecated code

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

diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 15ebad7..2097c4b 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -48,7 +48,7 @@ from taconstants import HORIZONTAL_PALETTE, VERTICAL_PALETTE, BLOCK_SCALE, \
     TOOLBAR_SHAPES, TAB_LAYER, RETURN, OVERLAY_LAYER, CATEGORY_LAYER, \
     BLOCKS_WITH_SKIN, ICON_SIZE, PALETTE_SCALE, PALETTE_WIDTH, SKIN_PATHS, \
     MACROS, TOP_LAYER, BLOCK_LAYER, OLD_NAMES, DEFAULT_TURTLE, TURTLE_LAYER, \
-    CURSOR, EXPANDABLE, COLLAPSIBLE, DEAD_DICTS, DEAD_KEYS, NO_IMPORT, \
+    CURSOR, EXPANDABLE, DEAD_DICTS, DEAD_KEYS, NO_IMPORT, \
     TEMPLATES, PYTHON_SKIN, PALETTE_HEIGHT, STATUS_LAYER, OLD_DOCK, \
     EXPANDABLE_ARGS, XO1, XO15, XO175, XO30, TITLEXY, CONTENT_ARGS, \
     CONSTANTS, EXPAND_SKIN, PROTO_LAYER, EXPANDABLE_FLOW
@@ -3317,18 +3317,12 @@ class TurtleArtWindow():
             if not self._find_proto_name('box_%s' % (name), name):
                 self._new_box_block(name)
 
-        if btype in content_blocks or btype in COLLAPSIBLE:
+        if btype in content_blocks:
             if btype == 'number':
                 try:
                     values = [round_int(value)]
                 except ValueError:
                     values = [0]
-            # Deprecated
-            elif btype in COLLAPSIBLE:
-                if value is not None:
-                    values = [int(value)]
-                else:
-                    values = []
             else:
                 values = [value]
         else:
@@ -3525,7 +3519,7 @@ class TurtleArtWindow():
         for i, blk in enumerate(blks):
             blk.id = i
         for blk in blks:
-            if blk.name in content_blocks or blk.name in COLLAPSIBLE:
+            if blk.name in content_blocks:
                 if len(blk.values) > 0:
                     name = (blk.name, blk.values[0])
                 else:
--
cgit v0.9.1