Fix mistakes (aimacode#225)

* fixes an error in search.py

* modifies the method name 'exec' which is a built-in name

Author: SnShine

canvas.py

@@ -33,7 +33,7 @@ def mouse_click(self, x, y):
     def mouse_move(self, x, y):
         raise NotImplementedError
 
-    def exec(self, exec_str):
+    def execute(self, exec_str):
         "Stores the command to be exectued to a list which is used later during update()"
         if not isinstance(exec_str, str):
             print("Invalid execution argument:",exec_str)
@@ -43,19 +43,19 @@ def exec(self, exec_str):
 
     def fill(self, r, g, b):
         "Changes the fill color to a color in rgb format"
-        self.exec("fill({0}, {1}, {2})".format(r, g, b))
+        self.execute("fill({0}, {1}, {2})".format(r, g, b))
 
     def stroke(self, r, g, b):
         "Changes the colors of line/strokes to rgb"
-        self.exec("stroke({0}, {1}, {2})".format(r, g, b))
+        self.execute("stroke({0}, {1}, {2})".format(r, g, b))
 
     def strokeWidth(self, w):
         "Changes the width of lines/strokes to 'w' pixels"
-        self.exec("strokeWidth({0})".format(w))
+        self.execute("strokeWidth({0})".format(w))
 
     def rect(self, x, y, w, h):
         "Draw a rectangle with 'w' width, 'h' height and (x, y) as the top-left corner"
-        self.exec("rect({0}, {1}, {2}, {3})".format(x, y, w, h))
+        self.execute("rect({0}, {1}, {2}, {3})".format(x, y, w, h))
 
     def rect_n(self, xn, yn, wn, hn):
         "Similar to rect(), but the dimensions are normalized to fall between 0 and 1"
@@ -67,7 +67,7 @@ def rect_n(self, xn, yn, wn, hn):
 
     def line(self, x1, y1, x2, y2):
         "Draw a line from (x1, y1) to (x2, y2)"
-        self.exec("line({0}, {1}, {2}, {3})".format(x1, y1, x2, y2))
+        self.execute("line({0}, {1}, {2}, {3})".format(x1, y1, x2, y2))
 
     def line_n(self, x1n, y1n, x2n, y2n):
         "Similar to line(), but the dimensions are normalized to fall between 0 and 1"
@@ -79,7 +79,7 @@ def line_n(self, x1n, y1n, x2n, y2n):
 
     def arc(self, x, y, r, start, stop):
         "Draw an arc with (x, y) as centre, 'r' as radius from angles 'start' to 'stop'"
-        self.exec("arc({0}, {1}, {2}, {3}, {4})".format(x, y, r, start, stop))
+        self.execute("arc({0}, {1}, {2}, {3}, {4})".format(x, y, r, start, stop))
 
     def arc_n(self, xn ,yn, rn, start, stop):
         """Similar to arc(), but the dimensions are normalized to fall between 0 and 1
@@ -92,18 +92,18 @@ def arc_n(self, xn ,yn, rn, start, stop):
 
     def clear(self):
         "Clear the HTML canvas"
-        self.exec("clear()")
+        self.execute("clear()")
 
     def font(self, font):
         "Changes the font of text"
-        self.exec('font("{0}")'.format(font))
+        self.execute('font("{0}")'.format(font))
 
     def text(self, txt, x, y, fill = True):
         "Display a text at (x, y)"
         if fill:
-            self.exec('fill_text("{0}", {1}, {2})'.format(txt, x, y))
+            self.execute('fill_text("{0}", {1}, {2})'.format(txt, x, y))
         else:
-            self.exec('stroke_text("{0}", {1}, {2})'.format(txt, x, y))
+            self.execute('stroke_text("{0}", {1}, {2})'.format(txt, x, y))
 
     def text_n(self, txt, xn, yn, fill = True):
         "Similar to text(), but with normalized coordinates"
@@ -116,7 +116,7 @@ def alert(self, message):
         display(HTML('<script>alert("{0}")</script>'.format(message)))
 
     def update(self):
-        "Execute the JS code to execute the commands queued by exec()"
+        "Execute the JS code to execute the commands queued by execute()"
         exec_code = "<script>\n"+'\n'.join(self.exec_list)+"\n</script>"
         self.exec_list = []
         display(HTML(exec_code))

search.py

@@ -465,7 +465,7 @@ def __call__(self, percept):
     def update_state(self, percept):
         ''' To be overriden in most cases. The default case
         assumes th percept to be of type state'''
-        raise percept
+        return percept
 
 # ______________________________________________________________________________