Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt
diff options
context:
space:
mode:
authorWalter Bender <walter@sugarlabs.org>2010-09-21 15:10:13 (GMT)
committer Walter Bender <walter@sugarlabs.org>2010-09-21 15:10:13 (GMT)
commit7680eb3c786f474731a6c1e2c43599976d44a397 (patch)
tree4ca48326a640eb9e05e67ee9ed168929acc2d5d8 /TurtleArt
parent2e3dd10ae9792b380bfe538597cefb6aa92dee2e (diff)
removed has_key references
Diffstat (limited to 'TurtleArt')
-rw-r--r--TurtleArt/tablock.py8
-rw-r--r--TurtleArt/tacanvas.py2
-rw-r--r--TurtleArt/talogo.py6
-rw-r--r--TurtleArt/taturtle.py8
-rw-r--r--TurtleArt/tawindow.py16
5 files changed, 20 insertions, 20 deletions
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index eccece8..16f08db 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -107,7 +107,7 @@ class Block:
self._font_size = [6.0, 4.5]
self._image = None
- if OLD_NAMES.has_key(self.name):
+ if self.name in OLD_NAMES:
self.name = OLD_NAMES[self.name]
for i in range(len(self._font_size)):
@@ -128,7 +128,7 @@ class Block:
break
self._new_block_from_factory(sprite_list, x, y, copy_block)
- if PRIMITIVES.has_key(name):
+ if name in PRIMITIVES:
self.primitive = PRIMITIVES[self.name]
block_list.append_to_list(self)
@@ -316,7 +316,7 @@ class Block:
for i, v in enumerate(self.values):
if v is not None:
self._set_labels(i, str(v))
- elif BLOCK_NAMES.has_key(self.name):
+ elif self.name in BLOCK_NAMES:
for i, n in enumerate(BLOCK_NAMES[self.name]):
self._set_labels(i, n)
@@ -432,7 +432,7 @@ class Block:
print "WARNING: I don't know how to create a %s block" % (self.name)
def _set_colors(self, svg):
- if BOX_COLORS.has_key(self.name):
+ if self.name in BOX_COLORS:
self.colors = BOX_COLORS[self.name]
else:
for p in range(len(PALETTES)):
diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py
index 786a2f8..9975cd2 100644
--- a/TurtleArt/tacanvas.py
+++ b/TurtleArt/tacanvas.py
@@ -622,7 +622,7 @@ class TurtleGraphics:
def set_turtle(self, k, colors=None):
""" Select the current turtle and associated pen status """
- if not self.tw.turtles.dict.has_key(k):
+ if k not in self.tw.turtles.dict:
# if it is a new turtle, start it in the center of the screen
self.tw.active_turtle = self.tw.turtles.get_turtle(k, True, colors)
self.seth(0, False)
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index a9b13dc..0af7110 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -916,10 +916,10 @@ class LogoCode:
if type(convert(x, float, False)) == float:
if int(float(x)) == x:
x = int(x)
- if (not self.stacks.has_key('stack3'+str(x))) or\
- self.stacks['stack3'+str(x)] is None:
+ if 'stack3' + str(x) not in self.stacks or\
+ self.stacks['stack3' + str(x)] is None:
raise logoerror("#nostack")
- self.icall(self.evline, self.stacks['stack3'+str(x)][:])
+ self.icall(self.evline, self.stacks['stack3' + str(x)][:])
yield True
self.procstop = False
self.ireturn()
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py
index 3173a40..55cac08 100644
--- a/TurtleArt/taturtle.py
+++ b/TurtleArt/taturtle.py
@@ -53,7 +53,7 @@ class Turtles:
def get_turtle(self, k, append=False, colors=None):
""" Find a turtle """
- if self.dict.has_key(k):
+ if k in self.dict:
return self.dict[k]
elif not append:
return None
@@ -81,7 +81,7 @@ class Turtles:
def remove_from_dict(self, k):
""" Delete a turtle """
- if self.dict.has_key(k):
+ if k in self.dict:
del(self.dict[k])
def show_all(self):
@@ -164,9 +164,9 @@ class Turtle:
images.append(images[i].rotate_simple(270))
for i in range(SHAPES):
j = (i + 4) % SHAPES
- self.shapes[j] = images[int(j/9) % 4]
+ self.shapes[j] = images[int(j / 9)]
else:
- j = int(self.heading+5)%360 / (360 / SHAPES)
+ j = int(self.heading + 5) % 360 / (360 / SHAPES)
self.shapes[j] = images[0]
def set_heading(self, heading):
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index aee66cf..0cbefde 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -765,7 +765,7 @@ class TurtleArtWindow():
self._restore_latest_from_trash()
elif blk.name == 'empty':
self._empty_trash()
- elif MACROS.has_key(blk.name):
+ elif blk.name in MACROS:
self._new_macro(blk.name, x + 20, y + 20)
else:
blk.highlight()
@@ -990,7 +990,7 @@ class TurtleArtWindow():
newspr.set_layer(TOP_LAYER)
self.drag_pos = 20, 20
newblk.connections = [None]*len(newblk.docks)
- if DEFAULTS.has_key(newblk.name):
+ if newblk.name in DEFAULTS:
for i, argvalue in enumerate(DEFAULTS[newblk.name]):
# skip the first dock position since it is always a connector
dock = newblk.docks[i + 1]
@@ -1282,15 +1282,15 @@ class TurtleArtWindow():
def _do_show_popup(self, block_name):
""" Fetch the help text and display it. """
- if SPECIAL_NAMES.has_key(block_name):
+ if block_name in SPECIAL_NAMES:
block_name_s = SPECIAL_NAMES[block_name]
- elif BLOCK_NAMES.has_key(block_name):
+ elif block_name in BLOCK_NAMES:
block_name_s = BLOCK_NAMES[block_name][0]
elif block_name in TOOLBAR_SHAPES:
block_name_s = ''
else:
block_name_s = _(block_name)
- if HELP_STRINGS.has_key(block_name):
+ if block_name in HELP_STRINGS:
if block_name_s == '':
label = HELP_STRINGS[block_name]
else:
@@ -1907,7 +1907,7 @@ class TurtleArtWindow():
'KP_Right':[10, 0], 'l':[10, 0], 'Right':[10, 0],
'KP_Page_Down':[0, 0], 'KP_Page_Up':[0, 0], 'KP_End':[0, 0],
'KP_Home':[-1, -1], 'Return':[-1, -1], 'Esc':[0, 0]}
- if not mov_dict.has_key(keyname):
+ if keyname not in mov_dict:
return
if keyname == 'KP_End':
self.run_button(0)
@@ -2109,7 +2109,7 @@ class TurtleArtWindow():
check_dock = True
else:
check_dock = False
- if OLD_NAMES.has_key(btype):
+ if btype in OLD_NAMES:
btype = OLD_NAMES[btype]
blk = Block(self.block_list, self.sprite_list, btype,
b[2] + self.canvas.cx + offset,
@@ -2291,7 +2291,7 @@ class TurtleArtWindow():
_logger.debug(label)
return
if shp == 'syntaxerror' and str(label) != '':
- if self.status_shapes.has_key(str(label)[1:]):
+ if str(label)[1:] in self.status_shapes:
shp = str(label)[1:]
label = ''
else: