diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2013-11-05 05:32:43 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2013-11-05 05:32:43 (GMT) |
| commit | 33697496490251b3fea04614c98a088ba0e04c6a (patch) | |
| tree | e46c6df4d25b58e1ffbe27266295469c22e981e7 /TurtleArt/tautils.py | |
| parent | 98f04c96ece3135b69208a2a807657d9289c3c95 (diff) | |
| parent | 276f8bd1f47c4fec36904e4a968dd7f38c70fe51 (diff) | |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
Diffstat (limited to 'TurtleArt/tautils.py')
| -rw-r--r-- | TurtleArt/tautils.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py index ef80877..ff30b19 100644 --- a/TurtleArt/tautils.py +++ b/TurtleArt/tautils.py @@ -51,7 +51,7 @@ except (ImportError, AttributeError): from StringIO import StringIO from taconstants import (HIT_HIDE, HIT_SHOW, XO1, XO15, XO175, XO4, UNKNOWN, - MAGICNUMBER, SUFFIX) + MAGICNUMBER, SUFFIX, ARG_MUST_BE_NUMBER) import logging _logger = logging.getLogger('turtleart-activity') @@ -677,14 +677,11 @@ def arithmetic_check(blk1, blk2, dock1, dock2): return False if dock1 == 2 and zero_arg(blk2.values[0]): return False - elif blk1.name \ - in ['product2', 'minus2', 'random', 'remainder2', 'string'] and \ - blk2.name \ - in ['product2', 'minus2', 'random', 'remainder2', 'string']: + elif blk1.name in ARG_MUST_BE_NUMBER and blk2.name in ARG_MUST_BE_NUMBER: if blk1.name == 'string': if not numeric_arg(blk1.values[0]): return False - elif blk1.name == 'string': + elif blk2.name == 'string': if not numeric_arg(blk2.values[0]): return False elif blk1.name in ['greater2', 'less2'] and blk2.name == 'string': |