Commit 907b62a0 authored by Marianne Corvellec's avatar Marianne Corvellec

Let process_text() return a dict.

parent 740b3e0c
...@@ -169,6 +169,15 @@ def test_single_color_func_grey(): ...@@ -169,6 +169,15 @@ def test_single_color_func_grey():
assert_equal(red_function(random_state=random), 'rgb(56, 56, 56)') assert_equal(red_function(random_state=random), 'rgb(56, 56, 56)')
def test_process_text():
# test that process function returns a dict
wc = WordCloud(max_words=50)
result = wc.process_text(THIS)
# check for proper return type
assert_true(isinstance(result, dict))
def check_parameters(): def check_parameters():
# check that parameters are actually used # check that parameters are actually used
pass pass
...@@ -427,7 +427,7 @@ class WordCloud(object): ...@@ -427,7 +427,7 @@ class WordCloud(object):
first = max(d2.items(), key=item1)[0] first = max(d2.items(), key=item1)[0]
d3[first] = sum(d2.values()) d3[first] = sum(d2.values())
return d3.items() return d3
def generate_from_text(self, text): def generate_from_text(self, text):
"""Generate wordcloud from text. """Generate wordcloud from text.
...@@ -439,7 +439,7 @@ class WordCloud(object): ...@@ -439,7 +439,7 @@ class WordCloud(object):
self self
""" """
words = self.process_text(text) words = self.process_text(text)
self.generate_from_frequencies(words) self.generate_from_frequencies(words.items())
return self return self
def generate(self, text): def generate(self, text):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment