diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2012-03-23 20:20:02 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2012-03-23 20:28:11 +0100 |
| commit | 7b82f56bae58efa29304584464b8ea8a1b574475 (patch) | |
| tree | 8cb48ac88660ab5d72dac0eb55049df98c521a87 /mediagoblin/db/mixin.py | |
| parent | 5bad26bc47201aea14b57b0e03aca7eb89447212 (diff) | |
| download | mediagoblin-7b82f56bae58efa29304584464b8ea8a1b574475.tar.lz mediagoblin-7b82f56bae58efa29304584464b8ea8a1b574475.tar.xz mediagoblin-7b82f56bae58efa29304584464b8ea8a1b574475.zip | |
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()
Diffstat (limited to 'mediagoblin/db/mixin.py')
| -rw-r--r-- | mediagoblin/db/mixin.py | 3 |
1 files changed, 2 insertions, 1 deletions
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") |