From 1bc92be33516bdf3a9f92c5793863d5d20a5619b Mon Sep 17 00:00:00 2001 From: cedricbonhomme Date: Mon, 18 Oct 2010 13:33:55 +0200 Subject: Improvements of the top_words() function using a regular expression. --- utils.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/utils.py b/utils.py index 18deff58..0b33b4dd 100755 --- a/utils.py +++ b/utils.py @@ -162,12 +162,11 @@ def top_words(dic_articles, n=10, size=5): Return the n most frequent words in a list. """ words = Counter() + wordre = re.compile(r'\b\w{%s,}\b' % size) for rss_feed_id in dic_articles.keys(): for article in dic_articles[rss_feed_id]: - for good_word in [word.strip(punctuation).lower() \ - for word in clear_string(article[4].encode('utf-8')).split() \ - if len(word.strip(punctuation)) >= size]: - words[good_word] += 1 + for word in wordre.findall(clear_string(article[4].encode('utf-8'))): + words[word.lower()] += 1 return words.most_common(n) def tag_cloud(tags, query="word_count"): -- cgit