*** empty log message ***

direct/src/gui/PickList.py

@@ -32,11 +32,14 @@ class PickList(PandaObject.PandaObject):
         
         # display the menu
         self.__displayChoices(choiceList)
+	self.isClean = 0
 	return None
 
     def cleanup(self):
 	"""cleanup(self)
 	"""
+	if self.isClean == 0:
+	    self.isClean = 1
             # remove keyboard events
             self.ignore("up-up")
             self.ignore("down-up")

direct/src/showbase/DirectObject.py

@@ -11,7 +11,7 @@ class DirectObject:
 	"""
 	try: 
 	    self.cleanup()
-	except:
+	except NameError:
 	    print "No cleanup() method defined!"
 
     # Event Handling