From 7ab3e228be2762ec9fe594931f8448e1d8b16344 Mon Sep 17 00:00:00 2001
From: Marion <marion.zepf@gmail.com>
Date: Sun, 11 Aug 2013 21:49:41 +0000
Subject: Merge branch 'master' into primitive-class

---
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)
--
cgit v0.9.1