From 6e8f7e1a2fa41b5857a806aae4031b536f274f06 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Mon, 09 Dec 2013 18:44:26 +0000 Subject: resync with v194 --- (limited to 'TurtleArt/sprites.py') diff --git a/TurtleArt/sprites.py b/TurtleArt/sprites.py index 7483c12..3f5d7df 100644 --- a/TurtleArt/sprites.py +++ b/TurtleArt/sprites.py @@ -106,7 +106,7 @@ class Sprites: def length_of_list(self): ''' How many sprites are there? ''' - return(len(self.list)) + return len(self.list) def append_to_list(self, spr): ''' Append a new sprite to the end of the list. ''' @@ -122,9 +122,7 @@ class Sprites: self.list.insert(i, spr) def find_in_list(self, spr): - if spr in self.list: - return True - return False + return (spr in self.list) def remove_from_list(self, spr): ''' Remove a sprite from the list. ''' @@ -258,7 +256,8 @@ class Sprite: if layer is not None: self.layer = layer for i in range(self._sprites.length_of_list()): - if self.layer < self._sprites.get_sprite(i).layer: + spr = self._sprites.get_sprite(i) + if spr is not None and self.layer < spr.layer: self._sprites.insert_in_list(self, i) self.inval() return -- cgit v0.9.1