Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt/tawindow.py
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2012-07-06 23:38:54 (GMT)
committer Walter Bender <walter.bender@gmail.com>2012-07-06 23:38:54 (GMT)
commit4c49dee1049dff9a3e1adfac544c4afe7cbab464 (patch)
tree8d367d2e06f06bb4d736b0a1836331b83214c421 /TurtleArt/tawindow.py
parent695b022046650ae05b4ab6d60e457af207e8d618 (diff)
remove more deprecated code
Diffstat (limited to 'TurtleArt/tawindow.py')
-rw-r--r--TurtleArt/tawindow.py12
1 files changed, 3 insertions, 9 deletions
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: