Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarion <marion.zepf@gmail.com>2013-08-11 21:49:41 (GMT)
committer Marion <marion.zepf@gmail.com>2013-08-11 21:49:41 (GMT)
commit7ab3e228be2762ec9fe594931f8448e1d8b16344 (patch)
treee2b68c5811f9893eed5d59f63317bca888165cd9
parent6f0bd6bec7e548cd1d031ce413a24f4b842b3fdf (diff)
parent2479920c008c78a379858803055aab41f3912c51 (diff)
Merge branch 'master' into primitive-class
-rw-r--r--TurtleArt/tablock.py2
-rw-r--r--TurtleArt/talogo.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index 13f50ae..f44e3dc 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -310,7 +310,7 @@ class Block:
elif self.name in media_blocks_dictionary:
return '#smedia_' + self.name.upper()
else:
- return '%nothing%'
+ return None
def highlight(self):
""" We may want to highlight a block... """
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index 4512387..dceee92 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -295,7 +295,7 @@ class LogoCode:
code.append(blk.primitive) # Hidden block
elif blk.is_value_block(): # Extract the value from content blocks.
value = blk.get_value()
- if value == '%nothing%':
+ if value is None:
return ['%nothing%']
else:
code.append(value)