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()
This commit is contained in:
parent
5bad26bc47
commit
7b82f56bae
@ -32,7 +32,6 @@ from mediagoblin.auth import lib as auth_lib
|
|||||||
from mediagoblin.tools import common, licenses
|
from mediagoblin.tools import common, licenses
|
||||||
from mediagoblin.tools.text import cleaned_markdown_conversion
|
from mediagoblin.tools.text import cleaned_markdown_conversion
|
||||||
from mediagoblin.tools.url import slugify
|
from mediagoblin.tools.url import slugify
|
||||||
from mediagoblin.tools.exif import USEFUL_TAGS
|
|
||||||
|
|
||||||
|
|
||||||
class UserMixin(object):
|
class UserMixin(object):
|
||||||
@ -125,6 +124,8 @@ class MediaEntryMixin(object):
|
|||||||
return licenses.SUPPORTED_LICENSES[self.license or ""]
|
return licenses.SUPPORTED_LICENSES[self.license or ""]
|
||||||
|
|
||||||
def exif_display_iter(self):
|
def exif_display_iter(self):
|
||||||
|
from mediagoblin.tools.exif import USEFUL_TAGS
|
||||||
|
|
||||||
if not self.media_data:
|
if not self.media_data:
|
||||||
return
|
return
|
||||||
exif_all = self.media_data.get("exif_all")
|
exif_all = self.media_data.get("exif_all")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user