Let process_text() return a dict.

tonydeep · Apr 7, 2016 · 907b62a · 907b62a
1 parent 740b3e0
commit 907b62a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/test/test_wordcloud.py b/test/test_wordcloud.py
@@ -169,6 +169,15 @@ def test_single_color_func_grey():
     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():
     # check that parameters are actually used
     pass
diff --git a/wordcloud/wordcloud.py b/wordcloud/wordcloud.py
@@ -427,7 +427,7 @@ def process_text(self, text):
             first = max(d2.items(), key=item1)[0]
             d3[first] = sum(d2.values())
 
-        return d3.items()
+        return d3
 
     def generate_from_text(self, text):
         """Generate wordcloud from text.
@@ -439,7 +439,7 @@ def generate_from_text(self, text):
         self
         """
         words = self.process_text(text)
-        self.generate_from_frequencies(words)
+        self.generate_from_frequencies(words.items())
         return self
 
     def generate(self, text):