changes in Bitmap._process_bitmap

xlwt/Bitmap.py

@@ -7,6 +7,7 @@
 from BIFFRecords import BiffRecord
 from struct import pack, unpack
 
+import glob
 
 def _size_col(sheet, col):
     return sheet.col_width(col)
@@ -192,12 +193,20 @@ def _process_bitmap(bitmap):
 
     """
     # Open file and binmode the data in case the platform needs it.
-    fh = file(bitmap, "rb")
-    try:
-        # Slurp the file into a string.
-        data = fh.read()
-    finally:
-        fh.close()
+    if hasattr(getattr(bitmap, "read",None),'__call__'):#StringIO object
+        data=bitmap.read()
+    elif glob.glob(bitmap):#just file - Open file and binmode the data in case the platform needs it.
+        fh = file(bitmap, "rb")
+        try:
+            # Slurp the file into a string.
+            data=fh.read()
+        finally:
+            fh.close()
+    elif bitmap[:4]=='424d':#hex data - BMP signature
+        data=bitmap.decode("hex")
+    else:#binary data
+        data=bitmap
+
     # Check that the file is big enough to be a bitmap.
     if len(data) <= 0x36:
         raise Exception("bitmap doesn't contain enough data.")