Added support for existing Image objects.

With corresponding tests.

Resolves #1!

colorgram/colorgram.py

@@ -35,7 +35,7 @@ def hsl(self):
             return self._hsl
 
 def extract(f, number_of_colors):
-    image = Image.open(f)
+    image = f if isinstance(f, Image.Image) else Image.open(f)
     if image.mode not in ('RGB', 'RGBA', 'RGBa'):
         image = image.convert('RGB')
 

readme.rst

@@ -53,7 +53,7 @@ Example
 
 ``colorgram.extract(image, number_of_colors)``
 ''''''''''''''''''''''''''''''''''''''''''''''
-Extract colors from an image. ``image`` may be either a path to a file, or a file-like object. The function will return a list of ``number_of_colors`` ``Color`` objects.
+Extract colors from an image. ``image`` may be either a path to a file, a file-like object, or a Pillow ``Image`` object. The function will return a list of ``number_of_colors`` ``Color`` objects.
 
 ``colorgram.Color``
 '''''''''''''''''''

setup.py

@@ -3,7 +3,7 @@
 
 from setuptools import setup
 
-VERSION = '1.1.0'
+VERSION = '1.2.0'
 
 REQUIREMENTS = [
     "pillow >= 3.3.1"

tests/test_access.py → tests/test_api.py

@@ -1,6 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import colorgram
+from PIL import Image
+
+def test_extract_from_file():
+    colorgram.extract('data/test.png', 1)
+
+def test_extract_from_image_object():
+    image = Image.open('data/test.png')
+    colorgram.extract(image, 1)
 
 def test_color_access():
     color = colorgram.Color(255, 151, 210, 0.15)