Skip to content

Commit

Permalink
Remove imports of unicode_literals
Browse files Browse the repository at this point in the history
I had put some of these in place to try and inch towards python3
somewhat. But people argue this isn't actually a good strategy:
PythonCharmers/python-future#22
  • Loading branch information
UnwashedMeme committed Apr 15, 2016
1 parent 804f1bd commit d0b236a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion 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

Expand Down
10 changes: 5 additions & 5 deletions 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

Expand All @@ -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):
Expand All @@ -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'
6 changes: 3 additions & 3 deletions 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
Expand Down Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion idigbio_ingestion/verify_ceph_objects.py
Expand Up @@ -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
Expand Down

0 comments on commit d0b236a

Please sign in to comment.