From 7b82f56bae58efa29304584464b8ea8a1b574475 Mon Sep 17 00:00:00 2001 From: Elrond Date: Fri, 23 Mar 2012 20:20:02 +0100 Subject: [PATCH] Fix cyclic import issue. Oh well: tools.exif -> processing -> db.util -> db.models -> db.mixin -> tools.exif So import tools.exif locally in exif_display_iter() --- mediagoblin/db/mixin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index 7d0e0e9a..a5aded02 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -32,7 +32,6 @@ from mediagoblin.auth import lib as auth_lib from mediagoblin.tools import common, licenses from mediagoblin.tools.text import cleaned_markdown_conversion from mediagoblin.tools.url import slugify -from mediagoblin.tools.exif import USEFUL_TAGS class UserMixin(object): @@ -125,6 +124,8 @@ class MediaEntryMixin(object): 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")