Skip to content
Permalink
Browse files

Merge branch 'master' into fight-the-future

  • Loading branch information
ralsina committed Oct 3, 2015
2 parents 873ada3 + 2bc4658 commit 484e6b70d517b59cfe80e0a88829e6e542ae9d4a
Showing with 5 additions and 7 deletions.
  1. +4 −2 nikola/image_processing.py
  2. +1 −1 nikola/nikola.py
  3. +0 −4 sextion_index
@@ -132,7 +132,7 @@ def resize_svg(self, src, dst, max_size, bigger_panoramas):
op.write(lxml.etree.tostring(tree))
op.close()
except (KeyError, AttributeError) as e:
self.logger.warn("No width/height in %s. Actuall exception: %s" % (src, e))
self.logger.warn("No width/height in %s. Original exception: %s" % (src, e))
utils.copy_file(src, dst)

def image_date(self, src):
@@ -148,8 +148,10 @@ def image_date(self, src):
decoded = ExifTags.TAGS.get(tag, tag)
if decoded in ('DateTimeOriginal', 'DateTimeDigitized'):
try:
if isinstance(value, tuple):
value = value[0]
self.dates[src] = datetime.datetime.strptime(
value, r'%Y:%m:%d %H:%M:%S')
value, '%Y:%m:%d %H:%M:%S')
break
except ValueError: # Invalid EXIF date.
pass
@@ -221,7 +221,7 @@
da='da',
de='de',
el='el',
en='',
en='en',
eo='eo',
es='es',
et='et',

This file was deleted.

0 comments on commit 484e6b7

Please sign in to comment.
You can’t perform that action at this time.