X-Git-Url: https://code.delx.au/bg-scripts/blobdiff_plain/a2686cb1eada91d486acc4bbebe57d321fcaa525..94a833d3bd9534b5e8b1487c78ddf7ba8bc0d3a9:/wallchanger.py

diff --git a/wallchanger.py b/wallchanger.py
index fa1c5d0..74be97b 100755
--- a/wallchanger.py
+++ b/wallchanger.py
@@ -6,6 +6,10 @@
 
 import commands, sys, os, os.path, time
 import logging
+try:
+	import PIL, PIL.Image
+except ImportError:
+	PIL = None
 
 __all__ = ("init", "set_image")
 
@@ -84,7 +88,12 @@ class BaseChanger(object):
 
 	def convert_image_format(self, filename, format='BMP', allowAlpha=False, extension='.bmp'):
 		"""Convert the image to another format, and store it in a local place"""
-		import PIL, PIL.Image
+		if not os.path.exists(filename):
+			logger.warn('The input file "%s" does not exist, so it will not be converted', filename)
+			return filename, False
+		if PIL is None:
+			logger.warn('PIL could not be found, not converting image format')
+			return filename, False
 
 		self.remove_old_image_cache()
 		output_name = os.path.join(self._ConvertedWallpaperLocation, '%s%s' % (time.time(), extension))