Skip to content

Test+Fix iters.flatten python2 unicode support. #78

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Test+Fix iters.flatten python2 unicode support. #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b6962c
test iters.flatten with unicode object
Digenis Oct 8, 2015
d5bffc9
python2 compatible flatten for strings
Digenis Oct 8, 2015
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
3 changes: 2 additions & 1 deletion fn/iters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,10 @@ def flatten(items):

http://docs.python.org/3.4/library/itertools.html#itertools-recipes
"""
str_type = basestring if version_info[0] < 3 else str
for item in items:
is_iterable = isinstance(item, Iterable)
is_string_or_bytes = isinstance(item, (str, bytes, bytearray))
is_string_or_bytes = isinstance(item, (str_type, bytes, bytearray))
if is_iterable and not is_string_or_bytes:
for i in flatten(item):
yield i
Expand Down
4 changes: 3 additions & 1 deletion tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,11 +621,13 @@ def test_flatten(self):
self.assertEqual([1,1,2,1,2,3], list(iters.flatten(generators)))
# flat list should return itself
self.assertEqual([1,2,3], list(iters.flatten([1,2,3])))
# Don't flatten strings, bytes, or bytearrays
# Don't flatten strings/unicode, bytes, or bytearrays
self.assertEqual([2,"abc",1], list(iters.flatten([2,"abc",1])))
self.assertEqual([2, b'abc', 1], list(iters.flatten([2, b'abc', 1])))
self.assertEqual([2, bytearray(b'abc'), 1],
list(iters.flatten([2, bytearray(b'abc'), 1])))
self.assertEqual([bytearray(b'abc'), b'\xd1\x8f'.decode('utf8'), b'y'],
list(iters.flatten([bytearray(b'abc'), b'\xd1\x8f'.decode('utf8'), b'y'])))

def test_accumulate(self):
self.assertEqual([1,3,6,10,15], list(iters.accumulate([1,2,3,4,5])))
Expand Down