Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2011-12-05 15:47:26 (GMT)
committer Walter Bender <walter.bender@gmail.com>2011-12-05 15:47:26 (GMT)
commit672a8780af43e9d77e7abef674f1b8d218999fb6 (patch)
tree8e62df52ec0e15197a50d687f63ce32faddcd065
parentbb359af22df915eb4fa17cbff76af0e6fc2a3d64 (diff)
remove perverse indirection
-rw-r--r--TurtleArt/talogo.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index 8f2b599..b63098d 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -265,6 +265,7 @@ class LogoCode:
The block associated with the command is stored as the second element
in a tuple, e.g., (#forward, 16)
"""
+ # debug_output(line, self.tw.running_sugar)
res = []
while line:
token = line.pop(0)
@@ -431,7 +432,12 @@ class LogoCode:
while (_millisecond() - starttime) < 120:
try:
if self.step is not None:
- self.step.next()
+ try:
+ self.step.next()
+ except ValueError:
+ debug_output('generator already executing',
+ self.tw.running_sugar)
+ return False
else:
return False
except StopIteration:
@@ -495,11 +501,11 @@ class LogoCode:
from tagplay import stop_media
# stop_media(self) # TODO: gplay variable
self.tw.canvas.clearscreen()
- self.tw.lc.scale = DEFAULT_SCALE
- self.tw.lc.hidden_turtle = None
- self.tw.lc.start_time = time()
+ self.scale = DEFAULT_SCALE
+ self.hidden_turtle = None
+ self.start_time = time()
for name in value_blocks:
- self.tw.lc.update_label_value(name)
+ self.update_label_value(name)
def int(self, n):
""" Raise an error if n doesn't convert to int. """