replace 'url2id' predicate with 'rssid'

weboob/backends/inrocks/GenericBackend.py

@@ -21,7 +21,7 @@ from __future__ import with_statement
 from weboob.capabilities.messages import ICapMessages, Message, Thread
 from weboob.tools.backend import BaseBackend
 from weboob.tools.newsfeed import Newsfeed
-from .tools import url2id
+from .tools import rssid
 
 class GenericNewspaperBackend(BaseBackend, ICapMessages):
     "GenericNewspaperBackend class"
@@ -67,7 +67,7 @@ class GenericNewspaperBackend(BaseBackend, ICapMessages):
         return thread
 
     def iter_threads(self):
-        for article in Newsfeed(self.RSS_FEED, url2id).iter_entries():
+        for article in Newsfeed(self.RSS_FEED, rssid).iter_entries():
             thread = Thread(article.id)
             thread.title =  article.title
             thread.date = article.datetime

weboob/backends/inrocks/tools.py

@@ -32,3 +32,6 @@ def id2url(_id):
 def url2id(url):
     "return an id from an url"
     return url
+
+def rssid(entry):
+    return url2id(entry.id)

weboob/backends/lefigaro/GenericBackend.py

@@ -21,7 +21,7 @@ from __future__ import with_statement
 from weboob.capabilities.messages import ICapMessages, Message, Thread
 from weboob.tools.backend import BaseBackend
 from weboob.tools.newsfeed import Newsfeed
-from .tools import url2id
+from .tools import rssid
 
 class GenericNewspaperBackend(BaseBackend, ICapMessages):
     "GenericNewspaperBackend class"
@@ -67,7 +67,7 @@ class GenericNewspaperBackend(BaseBackend, ICapMessages):
         return thread
 
     def iter_threads(self):
-        for article in Newsfeed(self.RSS_FEED, url2id).iter_entries():
+        for article in Newsfeed(self.RSS_FEED, rssid).iter_entries():
             thread = Thread(article.id)
             thread.title =  article.title
             thread.date = article.datetime

weboob/backends/lefigaro/tools.py

@@ -32,3 +32,6 @@ def id2url(_id):
 def url2id(url):
     "return an id from an url"
     return url
+
+def rssid(entry):
+    return url2id(entry.id)

weboob/backends/minutes20/GenericBackend.py

@@ -21,7 +21,7 @@ from __future__ import with_statement
 from weboob.capabilities.messages import ICapMessages, Message, Thread
 from weboob.tools.backend import BaseBackend
 from weboob.tools.newsfeed import Newsfeed
-from .tools import url2id
+from .tools import rssid
 
 class GenericNewspaperBackend(BaseBackend, ICapMessages):
     "GenericNewspaperBackend class"
@@ -67,7 +67,7 @@ class GenericNewspaperBackend(BaseBackend, ICapMessages):
         return thread
 
     def iter_threads(self):
-        for article in Newsfeed(self.RSS_FEED, url2id).iter_entries():
+        for article in Newsfeed(self.RSS_FEED, rssid).iter_entries():
             thread = Thread(article.id)
             thread.title =  article.title
             thread.date = article.datetime

weboob/backends/minutes20/tools.py

@@ -34,3 +34,6 @@ def url2id(url):
     regexp = re.compile("http://www.20minutes.fr/(\w+)/([0-9]+)/(.*$)")
     match = regexp.match(url)
     return '%s.%d.%s' % (match.group(1), int(match.group(2)), match.group(3))
+
+def rssid(entry):
+    return url2id(entry.id)