Skip to content

Rewrites the ensure_text implementation #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jakirkham merged 3 commits into from
Nov 3, 2019
Merged

Rewrites the ensure_text implementation #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
205851b
Rewrites the `ensure_text` implementation
jakirkham Oct 24, 2019
28d5998
Use `s` instead of `l` in `ensure_text`
jakirkham Oct 24, 2019
24559f4
Test `ensure_text` can coerce data to text
jakirkham Oct 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions numcodecs/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# flake8: noqa
from __future__ import absolute_import, print_function, division
import sys
import codecs
import array


Expand All @@ -26,11 +27,11 @@
from functools import reduce


def ensure_text(l, encoding='utf-8'):
if isinstance(l, text_type):
return l
else: # pragma: py3 no cover
return text_type(l, encoding=encoding)
def ensure_text(s, encoding='utf-8'):
if not isinstance(s, text_type):
s = ensure_contiguous_ndarray(s)
s = codecs.decode(s, 'ascii')
return s


def ensure_ndarray(buf):
Expand Down
14 changes: 13 additions & 1 deletion numcodecs/tests/test_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,19 @@
import pytest


from numcodecs.compat import ensure_bytes, PY2, ensure_contiguous_ndarray
from numcodecs.compat import ensure_text, ensure_bytes, PY2, ensure_contiguous_ndarray, text_type


def test_ensure_text():
bufs = [
b'adsdasdas',
u'adsdasdas',
np.asarray(memoryview(b'adsdasdas')),
array.array('B', b'qwertyuiqwertyui')
]
for buf in bufs:
b = ensure_text(buf)
assert isinstance(b, text_type)


def test_ensure_bytes():
Expand Down