diff options
| author | Joar Wandborg <joar@wandborg.se> | 2013-05-20 00:46:29 +0200 |
|---|---|---|
| committer | Joar Wandborg <joar@wandborg.se> | 2013-05-20 00:46:29 +0200 |
| commit | 1b6a2b85e11b18a6cdb69f23b6100f803ba7ac5b (patch) | |
| tree | 9aa4be1d10bed5f8b325abb50f44e9244f0a97d3 /mediagoblin/db/mixin.py | |
| parent | 907bba318a4e35634e613f2a3833badb4c9d6c2e (diff) | |
| download | mediagoblin-1b6a2b85e11b18a6cdb69f23b6100f803ba7ac5b.tar.lz mediagoblin-1b6a2b85e11b18a6cdb69f23b6100f803ba7ac5b.tar.xz mediagoblin-1b6a2b85e11b18a6cdb69f23b6100f803ba7ac5b.zip | |
Only calculate aperture if fnumber is provided
Diffstat (limited to 'mediagoblin/db/mixin.py')
| -rw-r--r-- | mediagoblin/db/mixin.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index b3a81a9a..027215aa 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -254,16 +254,15 @@ class MediaEntryMixin(GenerateSlugMixin): '%Y:%m:%d %H:%M:%S').date() taken = takendate.strftime('%B %d %Y') - fnum = None + aperture = None if 'EXIF FNumber' in exif_all: fnum = str(exif_all['EXIF FNumber']['printable']).split('/') - # calculate aperture - aperture = None - if len(fnum) == 2: - aperture = "f/%.1f" % (float(fnum[0])/float(fnum[1])) - elif fnum[0] != 'None': - aperture = "f/%s" % (fnum[0]) + # calculate aperture + if len(fnum) == 2: + aperture = "f/%.1f" % (float(fnum[0])/float(fnum[1])) + elif fnum[0] != 'None': + aperture = "f/%s" % (fnum[0]) return { "Camera" : exif_all['Image Model']['printable'], |