diff options
| author | jvoisin | 2018-03-25 17:42:29 +0200 |
|---|---|---|
| committer | jvoisin | 2018-03-27 20:42:13 +0200 |
| commit | e313ddb721cf7885809a749cdd3e7ae5af482f16 (patch) | |
| tree | 6d648387d4761af4c891c6a8ed71fa2c8487f445 /src | |
| parent | aa893e9d610d7de7ab4147f1197d23b3a2a1bd14 (diff) | |
Add gitlab-ci
Diffstat (limited to 'src')
| -rw-r--r-- | src/parsers/jpg.py | 2 | ||||
| -rw-r--r-- | src/parsers/png.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/parsers/jpg.py b/src/parsers/jpg.py index d1a4439..34fc04c 100644 --- a/src/parsers/jpg.py +++ b/src/parsers/jpg.py | |||
| @@ -19,7 +19,7 @@ class JPGParser(abstract.AbstractParser): | |||
| 19 | 19 | ||
| 20 | def get_meta(self): | 20 | def get_meta(self): |
| 21 | out = subprocess.check_output(['exiftool', '-json', self.filename]) | 21 | out = subprocess.check_output(['exiftool', '-json', self.filename]) |
| 22 | meta = json.loads(out)[0] | 22 | meta = json.loads(out.decode('utf-8'))[0] |
| 23 | for key in self.meta_whitelist: | 23 | for key in self.meta_whitelist: |
| 24 | meta.pop(key, None) | 24 | meta.pop(key, None) |
| 25 | return meta | 25 | return meta |
diff --git a/src/parsers/png.py b/src/parsers/png.py index 20cd234..377682e 100644 --- a/src/parsers/png.py +++ b/src/parsers/png.py | |||
| @@ -16,7 +16,7 @@ class PNGParser(abstract.AbstractParser): | |||
| 16 | 16 | ||
| 17 | def get_meta(self): | 17 | def get_meta(self): |
| 18 | out = subprocess.check_output(['exiftool', '-json', self.filename]) | 18 | out = subprocess.check_output(['exiftool', '-json', self.filename]) |
| 19 | meta = json.loads(out)[0] | 19 | meta = json.loads(out.decode('utf-8'))[0] |
| 20 | for key in self.meta_whitelist: | 20 | for key in self.meta_whitelist: |
| 21 | meta.pop(key, None) | 21 | meta.pop(key, None) |
| 22 | return meta | 22 | return meta |