diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2015-01-19 13:08:45 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2015-01-19 13:08:45 +0100 |
| commit | 7d2528280beff38779afae1503ab5ad3cf6a5cbf (patch) | |
| tree | 09aaf4f664636379614addf500a8d54c100b44e6 | |
| parent | Return proper date type. (diff) | |
| download | PhotoFloat-7d2528280beff38779afae1503ab5ad3cf6a5cbf.tar.xz PhotoFloat-7d2528280beff38779afae1503ab5ad3cf6a5cbf.zip | |
Python unicode is awful
| -rw-r--r-- | scanner/PhotoAlbum.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scanner/PhotoAlbum.py b/scanner/PhotoAlbum.py index fffe4ac..d6e14c4 100644 --- a/scanner/PhotoAlbum.py +++ b/scanner/PhotoAlbum.py @@ -145,9 +145,9 @@ class Photo(object): exif = {} for tag, value in info.items(): decoded = TAGS.get(tag, tag) - if isinstance(value, str): + if isinstance(value, str) or isinstance(value, unicode): value = value.strip().partition("\x00")[0] - if isinstance(decoded, str) and decoded.startswith("DateTime"): + if (isinstance(decoded, str) or isinstance(value, unicode)) and decoded.startswith("DateTime"): try: value = datetime.strptime(value, '%Y:%m:%d %H:%M:%S') except KeyboardInterrupt: @@ -315,8 +315,6 @@ class Photo(object): correct_date = self._attributes["dateTime"] else: correct_date = self._attributes["dateTimeFile"] - if isinstance(correct_date, unicode): - correct_date = datetime.strptime(correct_date, '%Y:%m:%d %H:%M:%S') return correct_date def __cmp__(self, other): |