Merge lp:~cjwatson/launchpad/pil-image into lp:launchpad

[Colin Watson]

Use "from PIL import Image" rather than "import Image".

The latter is deprecated, and no longer works in bionic.

We should probably move this into the virtualenv at some point rather than relying on a system dependency, but that'll require new -dev dependencies and is generally a bit more complicated than just chasing the module renaming.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/services/doc/sprites.txt'
--- lib/lp/services/doc/sprites.txt	2015-03-19 16:44:53 +0000
+++ lib/lp/services/doc/sprites.txt	2018-05-10 23:44:07 +0000
@@ -48,7 +48,7 @@
 in the file can be changed with the margin parameter.
 
     >>> import os, tempfile
-    >>> import Image
+    >>> from PIL import Image
     >>> from lp.services.spriteutils import SpriteUtil
     >>> root = os.path.abspath(os.path.join(__file__, '../../../../..'))
     >>> icing = os.path.join(root, 'lib/canonical/launchpad/icing')

=== modified file 'lib/lp/services/spriteutils.py'
--- lib/lp/services/spriteutils.py	2012-06-02 03:14:47 +0000
+++ lib/lp/services/spriteutils.py	2018-05-10 23:44:07 +0000
@@ -18,7 +18,7 @@
 from textwrap import dedent
 
 import cssutils
-import Image
+from PIL import Image
 import simplejson