python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-09 08:00:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make zlib and jpeg required by default

Browse Source
This commit is contained in:
wiredfool 2015-09-22 21:07:31 +01:00
parent 86be61b3c6
commit 29601ca119
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup.py
View File

@ -105,7 +105,7 @@ class pil_build_ext(build_ext):
class feature: class feature:
zlib = jpeg = tiff = freetype = tcl = tk = lcms = webp = webpmux = None zlib = jpeg = tiff = freetype = tcl = tk = lcms = webp = webpmux = None
jpeg2000 = None jpeg2000 = None
required = [] required = set(['jpeg', 'zlib'])
def require(self, feat): def require(self, feat):
return feat in self.required return feat in self.required
@ -139,12 +139,13 @@ class pil_build_ext(build_ext):
for x in self.feature: for x in self.feature:
if getattr(self, 'disable_%s' % x): if getattr(self, 'disable_%s' % x):
setattr(self.feature, x, False) setattr(self.feature, x, False)
self.feature.required.discard(x)
if getattr(self, 'enable_%s' % x): if getattr(self, 'enable_%s' % x):
raise ValueError( raise ValueError(
'Conflicting options: --enable-%s and --disable-%s' 'Conflicting options: --enable-%s and --disable-%s'
% (x, x)) % (x, x))
if getattr(self, 'enable_%s' % x): if getattr(self, 'enable_%s' % x):
self.feature.required.append(x) self.feature.required.add(x)
def build_extensions(self): def build_extensions(self):
@ -505,6 +506,10 @@ class pil_build_ext(build_ext):
for f in feature: for f in feature:
if not getattr(feature, f) and feature.require(f): if not getattr(feature, f) and feature.require(f):
if feature in ('jpeg', 'libz'):
raise ValueError('%s is required unless explicitly disabled'
+ ' using --disable-%s, aborting' %
(f, f))
raise ValueError( raise ValueError(
'--enable-%s requested but %s not found, aborting.' '--enable-%s requested but %s not found, aborting.'
% (f, f)) % (f, f))