diff --git a/idb/helpers/memoize.py b/idb/helpers/memoize.py index c006b581..a20c5440 100644 --- a/idb/helpers/memoize.py +++ b/idb/helpers/memoize.py @@ -1,5 +1,5 @@ from __future__ import division, absolute_import -from __future__ import print_function, unicode_literals +from __future__ import print_function from functools import wraps diff --git a/idb/tests/test_helpers_media_validation.py b/idb/tests/test_helpers_media_validation.py index d9fa05d6..338e761e 100644 --- a/idb/tests/test_helpers_media_validation.py +++ b/idb/tests/test_helpers_media_validation.py @@ -1,5 +1,5 @@ from __future__ import division, absolute_import -from __future__ import print_function, unicode_literals +from __future__ import print_function import pytest @@ -8,8 +8,8 @@ def test_sniff_validation_jpg(jpgpath): mime, mtype = medval.sniff_validation(jpgpath.open('rb').read(1024)) - assert mime == 'image/jpeg' - assert mtype == 'images' + assert mime == u'image/jpeg' + assert mtype == u'images' def test_sniff_validation_png(pngpath): @@ -19,5 +19,5 @@ def test_sniff_validation_png(pngpath): def test_sniff_validation_mp3(mp3path): mime, mtype = medval.sniff_validation(mp3path.open('rb').read(1024)) - assert mime == 'audio/mpeg' - assert mtype == 'sounds' + assert mime == u'audio/mpeg' + assert mtype == u'sounds' diff --git a/idigbio_ingestion/derivatives.py b/idigbio_ingestion/derivatives.py index accb3017..0417c2b3 100644 --- a/idigbio_ingestion/derivatives.py +++ b/idigbio_ingestion/derivatives.py @@ -1,5 +1,5 @@ from __future__ import division, absolute_import -from __future__ import print_function, unicode_literals +from __future__ import print_function from future_builtins import map, filter import os @@ -84,8 +84,8 @@ def count_results(results, update_freq=100): def get_keys(obj): etag, bucket = obj.etag, obj.bucket s = IDigBioStorage() - bucketbase = "idigbio-{0}-{1}".format(bucket, ENV) - return CheckItem(etag, bucket, + bucketbase = u"idigbio-{0}-{1}".format(bucket, ENV) + return CheckItem(unicode(etag), bucket, s.get_key(etag, bucketbase), s.get_key(etag + ".jpg", bucketbase + "-thumbnail"), s.get_key(etag + ".jpg", bucketbase + "-fullsize"), diff --git a/idigbio_ingestion/verify_ceph_objects.py b/idigbio_ingestion/verify_ceph_objects.py index 385b8560..8c316492 100644 --- a/idigbio_ingestion/verify_ceph_objects.py +++ b/idigbio_ingestion/verify_ceph_objects.py @@ -4,7 +4,7 @@ https://www.idigbio.org/redmine/issues/1863 """ from __future__ import division, absolute_import -from __future__ import print_function, unicode_literals +from __future__ import print_function import io import logging