Move all the canvas code that doesn't depend on goocanvas anymore in graphics.

tests/simulator/kiu.py

@@ -2,7 +2,7 @@
 
 from sugar.simulator import Bot
 from sugar.simulator import ShareActivityAction
-from sugar.canvas.IconColor import IconColor
+from sugar.graphics.iconcolor import IconColor
 import os, random, gobject
 
 class KiuBot(Bot):

tests/test-grid.py

@@ -10,11 +10,11 @@ session.start()
 import gtk
 import goocanvas
 
-from sugar.canvas.IconColor import IconColor
-from sugar.canvas.IconItem import IconItem
-from sugar.canvas.CanvasView import CanvasView
-from sugar.canvas.CanvasBox import CanvasBox
-from sugar.canvas.Grid import Grid
+from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.IconItem import IconItem
+from sugar.graphics.CanvasView import CanvasView
+from sugar.graphics.CanvasBox import CanvasBox
+from sugar.graphics.Grid import Grid
 
 def _new_icon_clicked_cb(icon):
 	box.remove_child(icon)

tests/test-icon-layout.py

@@ -15,10 +15,10 @@ import gtk
 import goocanvas
 
 from view.home.IconLayout import IconLayout
-from sugar.canvas import IconColor
-from sugar.canvas.IconItem import IconItem
-from sugar.canvas.CanvasView import CanvasView
-from sugar.canvas.Grid import Grid
+from sugar.graphics import IconColor
+from sugar.graphics.IconItem import IconItem
+from sugar.graphics.CanvasView import CanvasView
+from sugar.graphics.Grid import Grid
 
 def _create_icon():
 	color = IconColor.IconColor()

tests/test-icons.py

@@ -13,9 +13,9 @@ import random
 import gtk
 import hippo
 
-from sugar.canvas import IconColor
-from sugar.canvas.CanvasIcon import CanvasIcon
-from sugar.canvas.CanvasView import CanvasView
+from sugar.graphics import IconColor
+from sugar.graphics.CanvasIcon import CanvasIcon
+from sugar.graphics.CanvasView import CanvasView
 
 window = gtk.Window()
 window.connect("destroy", lambda w: gtk.main_quit())

tests/test-snowflake.py

@@ -14,11 +14,11 @@ import random
 import gtk
 import goocanvas
 
-from sugar.canvas.SnowflakeLayout import SnowflakeLayout
-from sugar.canvas import IconColor
-from sugar.canvas.IconItem import IconItem
-from sugar.canvas.CanvasView import CanvasView
-from sugar.canvas.Grid import Grid
+from sugar.graphics.snowflakelayout import SnowflakeLayout
+from sugar.graphics import IconColor
+from sugar.graphics.IconItem import IconItem
+from sugar.graphics.CanvasView import CanvasView
+from sugar.graphics.Grid import Grid
 
 def _create_snowflake(group, children):
 	color = IconColor.IconColor()

tests/test-theme.py

@@ -10,9 +10,9 @@ session.start()
 import gtk
 import goocanvas
 
-from sugar.canvas import IconColor
-from sugar.canvas.IconItem import IconItem
-from sugar.canvas.CanvasView import CanvasView
+from sugar.graphics import IconColor
+from sugar.graphics.IconItem import IconItem
+from sugar.graphics.CanvasView import CanvasView
 
 # Main window
 window = gtk.Window()