Attachment #578498 for bug #687242

View | Details | Raw Unified | Return to bug 687242
Collapse All | Expand All




        print '    !!! PyGTK .................... Not found'
        required_found = False
    try:
        from PIL import Image
        assert Image.__version__ >= '1.1.5'
        print '    Python Imaging Library ....... OK'
    except ImportError:
        print '    !!! Python Imaging Library ... Not found'
        required_found = False
    except AssertionError:
        print '    !!! Python Imaging Library ... version', Image.__version__,
        print 'found'
        print '    !!! Python Imaging Library 1.1.5 or higher is required'
        required_found = False

Lines 22-28 Link Here

(-)a/mime/comicthumb (-1 / +1 lines)
22	import subprocess	22	import subprocess
23		23
24	try:	24	try:
25	import Image	25	from PIL import Image
26	except ImportError:	26	except ImportError:
27	print '! Could not import the Image module (PIL).'	27	print '! Could not import the Image module (PIL).'
28	print __doc__	28	print __doc__




    sys.exit(1)

try:
    from PIL import Image
    assert Image.__version__ >= '1.1.5'
except AssertionError:
    print "You don't have the required version of the Python Imaging",
    print 'Library (PIL) installed.'
    print 'Installed PIL version is: %s' % Image.__version__
    print 'Required PIL version is: 1.1.5 or higher'
    sys.exit(1)
except ImportError:

Lines 1-9 Link Here

(-)a/src/histogram.py (-3 / +3 lines)
1	"""histogram.py - Draw histograms (RGB) from pixbufs."""	1	"""histogram.py - Draw histograms (RGB) from pixbufs."""
2		2
3	import gtk	3	import gtk
4	import Image	4	from PIL import Image
5	import ImageDraw	5	from PIL import ImageDraw
6	import ImageOps	6	from PIL import ImageOps
7		7
8	import image	8	import image
9		9

Lines 1-10 Link Here

(-)a/src/image.py (-4 / +4 lines)
1	"""image.py - Various image manipulations."""	1	"""image.py - Various image manipulations."""
2		2
3	import gtk	3	import gtk
4	import Image	4	from PIL import Image
5	import ImageEnhance	5	from PIL import ImageEnhance
6	import ImageOps	6	from PIL import ImageOps
7	import ImageStat	7	from PIL import ImageStat
8		8
9	from preferences import prefs	9	from preferences import prefs
10		10

Lines 8-15 Link Here

(-)a/src/library.py (-2 / +2 lines)
8	import gtk	8	import gtk
9	import gobject	9	import gobject
10	import pango	10	import pango
11	import Image	11	from PIL import Image
12	import ImageDraw	12	from PIL import ImageDraw
13		13
14	import archive	14	import archive
15	import encoding	15	import encoding

Lines 4-11 Link Here

(-)a/src/thumbbar.py (-2 / +2 lines)
4		4
5	import gtk	5	import gtk
6	import gobject	6	import gobject
7	import Image	7	from PIL import Image
8	import ImageDraw	8	from PIL import ImageDraw
9		9
10	import image	10	import image
11	from preferences import prefs	11	from preferences import prefs

Lines 15-21 Link Here

(-)a/src/thumbnail.py (-1 / +1 lines)
15	import tempfile	15	import tempfile
16		16
17	import gtk	17	import gtk
18	import Image	18	from PIL import Image
19		19
20	import archive	20	import archive
21	import constants	21	import constants

Lines 7-13 Link Here

(-)a/src/thumbremover.py (-1 / +1 lines)
7		7
8	import gtk	8	import gtk
9	import pango	9	import pango
10	import Image	10	from PIL import Image
11		11
12	import encoding	12	import encoding
13	import labels	13	import labels

Return to bug 687242

Lines 240-253 Link Here

(-)a/install.py (-3 / +3 lines)
240	print ' !!! PyGTK .................... Not found'	240	print ' !!! PyGTK .................... Not found'
241	required_found = False	241	required_found = False
242	try:	242	try:
243	import Image	243	from PIL import Image
244	assert Image.VERSION >= '1.1.5'	244	assert Image.__version__ >= '1.1.5'
245	print ' Python Imaging Library ....... OK'	245	print ' Python Imaging Library ....... OK'
246	except ImportError:	246	except ImportError:
247	print ' !!! Python Imaging Library ... Not found'	247	print ' !!! Python Imaging Library ... Not found'
248	required_found = False	248	required_found = False
249	except AssertionError:	249	except AssertionError:
250	print ' !!! Python Imaging Library ... version', Image.VERSION,	250	print ' !!! Python Imaging Library ... version', Image.__version__,
251	print 'found'	251	print 'found'
252	print ' !!! Python Imaging Library 1.1.5 or higher is required'	252	print ' !!! Python Imaging Library 1.1.5 or higher is required'
253	required_found = False	253	required_found = False

Lines 49-60 Link Here

(-)a/src/comix.py (-3 / +3 lines)
49	sys.exit(1)	49	sys.exit(1)
50		50
51	try:	51	try:
52	import Image	52	from PIL import Image
53	assert Image.VERSION >= '1.1.5'	53	assert Image.__version__ >= '1.1.5'
54	except AssertionError:	54	except AssertionError:
55	print "You don't have the required version of the Python Imaging",	55	print "You don't have the required version of the Python Imaging",
56	print 'Library (PIL) installed.'	56	print 'Library (PIL) installed.'
57	print 'Installed PIL version is: %s' % Image.VERSION	57	print 'Installed PIL version is: %s' % Image.__version__
58	print 'Required PIL version is: 1.1.5 or higher'	58	print 'Required PIL version is: 1.1.5 or higher'
59	sys.exit(1)	59	sys.exit(1)
60	except ImportError:	60	except ImportError: