Overhauled dependency check

1 files changed, 11 insertions, 9 deletions

diff --git a/kcc-c2e.py b/kcc-c2e.py
index 3288560..9957fc7 100755
--- a/kcc-c2e.py
+++ b/kcc-c2e.py
@@ -28,25 +28,27 @@ if sys.version_info[0] != 3:
     print('ERROR: This is Python 3 script!')
     exit(1)
 
-# Dependiences check
+# Dependency check
 missing = []
 try:
     # noinspection PyUnresolvedReferences
-    from psutil import virtual_memory, Popen
+    import psutil
+    if tuple(map(int, ('2.0.0'.split(".")))) > tuple(map(int, psutil.version_info)):
+        missing.append('psutil 2.0.0+')
 except ImportError:
-    missing.append('psutil')
+    missing.append('psutil 2.0.0+')
 try:
     # noinspection PyUnresolvedReferences
-    from slugify import slugify
+    import PIL
+    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (PIL.PILLOW_VERSION.split(".")))):
+        missing.append('Pillow 2.3.0+')
 except ImportError:
-    missing.append('python-slugify')
+    missing.append('Pillow 2.3.0+')
 try:
     # noinspection PyUnresolvedReferences
-    from PIL import Image, ImageOps, ImageStat, ImageChops
-    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
-        missing.append('Pillow 2.3.0+')
+    import slugify
 except ImportError:
-    missing.append('Pillow 2.3.0+')
+    missing.append('python-slugify')
 if len(missing) > 0:
     try:
         # noinspection PyUnresolvedReferences