From 2610fa4c76bc129fff51fcd33cc9670b7b04ed4e Mon Sep 17 00:00:00 2001 From: Vincent A Date: Sun, 11 Feb 2018 19:39:43 +0100 Subject: [PATCH] setup.py: depend on Pillow, don't do old debian stuff As of writing, debian stable (stretch) uses Pillow for PIL. --- setup.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 37fad02c74..e96161ba4f 100755 --- a/setup.py +++ b/setup.py @@ -135,19 +135,10 @@ def install_weboob(): 'html2text>=3.200', 'six', 'unidecode', + 'Pillow', 'mechanize; python_version < "3.0"', 'futures; python_version < "3.2"', ] - try: - import Image - except ImportError: - requirements.append('Pillow') - else: - # detect Pillow-only feature, or weird Debian stuff - if hasattr(Image, 'alpha_composite') or 'PILcompat' in Image.__file__: - requirements.append('Pillow') - else: - requirements.append('PIL') if not options.deps: requirements = [] -- GitLab