40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
Index: hplip-3.12.11/installer/core_install.py
|
|
===================================================================
|
|
--- hplip-3.12.11.orig/installer/core_install.py
|
|
+++ hplip-3.12.11/installer/core_install.py
|
|
@@ -1100,7 +1100,7 @@ class CoreInstall(object):
|
|
def check_pil(self):
|
|
log.debug("Checking for PIL...")
|
|
try:
|
|
- import Image
|
|
+ from PIL import Image
|
|
return True
|
|
except ImportError:
|
|
return False
|
|
Index: hplip-3.12.11/installer/dcheck.py
|
|
===================================================================
|
|
--- hplip-3.12.11.orig/installer/dcheck.py
|
|
+++ hplip-3.12.11/installer/dcheck.py
|
|
@@ -361,7 +361,7 @@ def get_xsane_version():
|
|
|
|
def get_pil_version():
|
|
try:
|
|
- import Image
|
|
+ from PIL import Image
|
|
except ImportError:
|
|
return '-'
|
|
else:
|
|
Index: hplip-3.12.11/scan.py
|
|
===================================================================
|
|
--- hplip-3.12.11.orig/scan.py
|
|
+++ hplip-3.12.11/scan.py
|
|
@@ -589,7 +589,7 @@ try:
|
|
from base import subproc as subprocess
|
|
|
|
try:
|
|
- import Image
|
|
+ from PIL import Image
|
|
except ImportError:
|
|
log.error("%s requires the Python Imaging Library (PIL). Exiting." % __mod__)
|
|
sys.exit(1)
|