Merge remote branch 'origin/master' into bug261-resized-filenames

This merge involved moving the new FilenameBuilder class to
processing/__init__.py, and putting the comment deletion tests back into
test_submission.py using the refactored functions.

1 files changed, 11 insertions, 0 deletions

diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py
index 4f9e1b11..a5aded02 100644
--- a/mediagoblin/db/mixin.py
+++ b/mediagoblin/db/mixin.py
@@ -123,6 +123,17 @@ class MediaEntryMixin(object):
         """Return license dict for requested license"""
         return licenses.SUPPORTED_LICENSES[self.license or ""]
 
+    def exif_display_iter(self):
+        from mediagoblin.tools.exif import USEFUL_TAGS
+
+        if not self.media_data:
+            return
+        exif_all = self.media_data.get("exif_all")
+
+        for key in USEFUL_TAGS:
+            if key in exif_all:
+                yield key, exif_all[key]
+
 
 class MediaCommentMixin(object):
     @property