~ubuntu-branches/debian/experimental/spyder/experimental

« back to all changes in this revision

Viewing changes to spyderlib/pil_patch.py

  • Committer: Package Import Robot
  • Author(s): Picca Frédéric-Emmanuel
  • Date: 2014-05-29 09:06:26 UTC
  • mfrom: (1.1.21) (18.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20140529090626-f58t82g0n5iewaxu
Tags: 2.3.0~rc+dfsg-1~experimental2
* Add spyder-common binary package for all the python2,3 common files
* debian/path
  - 0001-fix-documentation-installation.patch (deleted)
  + 0001-fix-spyderlib-path.patch (new)

Show diffs side-by-side

added added

removed removed

Lines of Context:
49
49
===============================================================================
50
50
"""
51
51
 
52
 
import Image
53
 
import PIL
54
 
PIL.Image = Image
 
52
try:
 
53
    # For Pillow compatibility
 
54
    from PIL import Image
 
55
    import PIL
 
56
    PIL.Image = Image
 
57
except ImportError:
 
58
    # For PIL
 
59
    import Image
 
60
    import PIL
 
61
    PIL.Image = Image