get_emoticons function should return dict instead of set

Author: ChillarAnand

nidaba/features/_util/question.py

@@ -161,7 +161,7 @@ def get_emoticons(text):
     """
     Return a list of emoticons in the given text.
     :param text: String.
-    :return: List of emoticons.
+    :return: Dictionary - emoticons as keys and their count as values.
     """
     emoticons = (":-) :) :D :o) :] :3 :c) :> =] 8) =) :} :^) :っ) :-D 8-D 8D"
                  "x-D xD X-D XD =-D =D =-3 =3 B^D :-)) >:[ :-( :( :-c :c :-<"
@@ -174,4 +174,5 @@ def get_emoticons(text):
                  ":-###.. :###.. <:-| ಠ_ಠ <*)))-{ ><(((*> ><> \o/ *\0/*"
                  "@}-;-'--- @>-->-- ~(_8^(I) 5:-) ~:-\ //0-0\\ *<|:-) =:o]"
                  ",:-) 7:^] <3 </3").split()
-    return frozenset(emoticons).intersection(text.split())
+    return dict((emoticon, text.count(emoticon)) for emoticon in emoticons
+                if emoticon in text.split())

nidaba/features/test/test_questions_util.py

@@ -216,7 +216,7 @@ def test_get_emoticons():
     Test the get_emoticons() _util function.
     :return: None
     """
-    text = 'these are emoticons :) :D :-) '
-    assert question.get_emoticons(text) == {':)', ':D', ':-)'}
-    code = 'this is code x = [:D], y = [0:3], ED8 = 12'
-    assert question.get_emoticons(code) != {':D', '0:3', 'D8'}
+    text = 'these are emoticons :) :D :)'
+    assert question.get_emoticons(text) == {':)': 2, ':D': 1}
+    code = 'this is code x = [:D], y = [0:3], ED8 = [:D]'
+    assert question.get_emoticons(code) != {':D': 2, '0:3': 1}