[MERGE] long import syntax for PIL modules.

bzr revid: vmt@openerp.com-20111114094932-qmkh1r5a5jxox3zq

openerp/report/render/__init__.py

@@ -26,7 +26,7 @@ from render import render
 #.apidoc title: Report Rendering
 
 try:
-    import Image
+    from PIL import Image
 except ImportError:
     import logging
     logging.warning('Python Imaging not installed, you can use only .JPG pictures !')

openerp/tools/graph.py

@@ -759,8 +759,8 @@ if __name__=='__main__':
     g.process(starting_node)
     g.scale(radius*3,radius*3, radius, radius)
 
-    import Image
-    import ImageDraw
+    from PIL import Image
+    from PIL import ImageDraw
     img = Image.new("RGB", (800, 600), "#ffffff")
     draw = ImageDraw.Draw(img)