Merge pull request #55 from cgohlke/patch-3

Fix pildriver script

Author: aclark4life

Scripts/pildriver.py

@@ -61,7 +61,7 @@ def do_verbose(self):
 
         Set verbosity flag from top of stack.
         """
-        self.verbose = self.do_pop()
+        self.verbose = int(self.do_pop())
 
     # The evaluation stack (internal only)
 
@@ -206,7 +206,7 @@ def do_filter(self):
 
         Process the top image with the given filter.
         """
-        import ImageFilter
+        from PIL import ImageFilter
         filter = eval("ImageFilter." + self.do_pop().upper())
         image = self.do_pop()
         self.push(image.filter(filter))
@@ -326,21 +326,21 @@ def do_format(self):
 
         Push the format of the top image onto the stack.
         """
-        self.push(self.pop().format)
+        self.push(self.do_pop().format)
 
     def do_mode(self):
         """usage: mode <image:pic1>
 
         Push the mode of the top image onto the stack.
         """
-        self.push(self.pop().mode)
+        self.push(self.do_pop().mode)
 
     def do_size(self):
         """usage: size <image:pic1>
 
         Push the image size on the stack as (y, x).
         """
-        size = self.pop().size
+        size = self.do_pop().size
         self.push(size[0])
         self.push(size[1])
 
@@ -351,15 +351,15 @@ def do_invert(self):
 
         Invert the top image.
         """
-        import ImageChops
+        from PIL import ImageChops
         self.push(ImageChops.invert(self.do_pop()))
 
     def do_lighter(self):
         """usage: lighter <image:pic1> <image:pic2>
 
         Pop the two top images, push an image of the lighter pixels of both.
         """
-        import ImageChops
+        from PIL import ImageChops
         image1 = self.do_pop()
         image2 = self.do_pop()
         self.push(ImageChops.lighter(image1, image2))
@@ -369,7 +369,7 @@ def do_darker(self):
 
         Pop the two top images, push an image of the darker pixels of both.
         """
-        import ImageChops
+        from PIL import ImageChops
         image1 = self.do_pop()
         image2 = self.do_pop()
         self.push(ImageChops.darker(image1, image2))
@@ -379,7 +379,7 @@ def do_difference(self):
 
         Pop the two top images, push the difference image
         """
-        import ImageChops
+        from PIL import ImageChops
         image1 = self.do_pop()
         image2 = self.do_pop()
         self.push(ImageChops.difference(image1, image2))
@@ -389,7 +389,7 @@ def do_multiply(self):
 
         Pop the two top images, push the multiplication image.
         """
-        import ImageChops
+        from PIL import ImageChops
         image1 = self.do_pop()
         image2 = self.do_pop()
         self.push(ImageChops.multiply(image1, image2))
@@ -399,7 +399,7 @@ def do_screen(self):
 
         Pop the two top images, superimpose their inverted versions.
         """
-        import ImageChops
+        from PIL import ImageChops
         image2 = self.do_pop()
         image1 = self.do_pop()
         self.push(ImageChops.screen(image1, image2))
@@ -409,7 +409,7 @@ def do_add(self):
 
         Pop the two top images, produce the scaled sum with offset.
         """
-        import ImageChops
+        from PIL import ImageChops
         image1 = self.do_pop()
         image2 = self.do_pop()
         scale = float(self.do_pop())
@@ -421,7 +421,7 @@ def do_subtract(self):
 
         Pop the two top images, produce the scaled difference with offset.
         """
-        import ImageChops
+        from PIL import ImageChops
         image1 = self.do_pop()
         image2 = self.do_pop()
         scale = float(self.do_pop())
@@ -435,7 +435,7 @@ def do_color(self):
 
         Enhance color in the top image.
         """
-        import ImageEnhance
+        from PIL import ImageEnhance
         factor = float(self.do_pop())
         image = self.do_pop()
         enhancer = ImageEnhance.Color(image)
@@ -446,32 +446,32 @@ def do_contrast(self):
 
         Enhance contrast in the top image.
         """
-        import ImageEnhance
+        from PIL import ImageEnhance
         factor = float(self.do_pop())
         image = self.do_pop()
-        enhancer = ImageEnhance.Color(image)
+        enhancer = ImageEnhance.Contrast(image)
         self.push(enhancer.enhance(factor))
 
     def do_brightness(self):
         """usage: brightness <image:pic1>
 
         Enhance brightness in the top image.
         """
-        import ImageEnhance
+        from PIL import ImageEnhance
         factor = float(self.do_pop())
         image = self.do_pop()
-        enhancer = ImageEnhance.Color(image)
+        enhancer = ImageEnhance.Brightness(image)
         self.push(enhancer.enhance(factor))
 
     def do_sharpness(self):
         """usage: sharpness <image:pic1>
 
         Enhance sharpness in the top image.
         """
-        import ImageEnhance
+        from PIL import ImageEnhance
         factor = float(self.do_pop())
         image = self.do_pop()
-        enhancer = ImageEnhance.Color(image)
+        enhancer = ImageEnhance.Sharpness(image)
         self.push(enhancer.enhance(factor))
 
     # The interpreter loop
@@ -512,7 +512,10 @@ def execute(self, list):
         print("PILDriver says hello.")
         while True:
             try:
-                line = raw_input('pildriver> ');
+                if sys.version_info[0] >= 3:
+                    line = input('pildriver> ');
+                else:
+                    line = raw_input('pildriver> ');
             except EOFError:
                 print("\nPILDriver says goodbye.")
                 break