--- a/degal/image.py	Sun Jun 14 16:27:03 2009 +0300
+++ b/degal/image.py	Sun Jun 14 16:34:40 2009 +0300
@@ -74,20 +74,28 @@
 
         # load stuff
         stat = self.stat()
-        exif = self.exif
 
         # XXX: avoid having to open the image?
         size = self.pil_image.size
         
         # build
-        return dict({
+        metadata = dict({
             "File name":        self.name,
             "Resolution":       "%dx%d" % size,
             "File size":        format.filesize(stat.st_size),
             "Last modified":    format.filetime(stat.st_mtime),
-        }, **dict(
-            (name, exif[tag]) for tag, name in self.config.exif_tags if exif and tag in exif
-        ))
+        })
+        
+        # optionally load Exif metadata
+        if self.config.exif_enabled :
+            exif = self.exif
+
+            # Get the wanted tags
+            metadata.update(dict(
+                (name, exif[tag]) for tag, name in self.config.exif_tags if exif and tag in exif
+            ))
+
+        return metadata
     
     def stale (self) :
         """