Only calculate aperture if fnumber is provided
authorJoar Wandborg <joar@wandborg.se>
Sun, 19 May 2013 22:46:29 +0000 (00:46 +0200)
committerJoar Wandborg <joar@wandborg.se>
Sun, 19 May 2013 22:46:29 +0000 (00:46 +0200)
mediagoblin/db/mixin.py

index b3a81a9acec58e86ffb3b50b4c3ce37c60295da4..027215aa5df3c24d070224a0f03bcd89403b42ae 100644 (file)
@@ -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'],