# HG changeset patch # User Dirk Olmes # Date 1272328701 -7200 # Node ID 215c34f61e95e07bc3cd980db713066836028087 # Parent 87317ba41816c44caefa20b91ac6234c0a503735 Feed.url -> Feed.rss_url diff -r 87317ba41816 -r 215c34f61e95 Feed.py --- a/Feed.py Tue Apr 27 02:30:50 2010 +0200 +++ b/Feed.py Tue Apr 27 02:38:21 2010 +0200 @@ -1,8 +1,8 @@ class Feed(object): - def __init__(self, name, url): - self.name = name - self.url = url + def __init__(self, title, rss_url): + self.title = title + self.rss_url = rss_url def __repr__(self): - return "" % (self.pk, self.name) + return "" % (self.pk, self.title) diff -r 87317ba41816 -r 215c34f61e95 FeedUpdater.py --- a/FeedUpdater.py Tue Apr 27 02:30:50 2010 +0200 +++ b/FeedUpdater.py Tue Apr 27 02:38:21 2010 +0200 @@ -16,7 +16,7 @@ self.feed = feed def update(self): - result = feedparser.parse(self.feed.url) + result = feedparser.parse(self.feed.rss_url) for entry in result.entries: self.processEntry(entry) diff -r 87317ba41816 -r 215c34f61e95 Mapping.py --- a/Mapping.py Tue Apr 27 02:30:50 2010 +0200 +++ b/Mapping.py Tue Apr 27 02:38:21 2010 +0200 @@ -16,8 +16,8 @@ feedTable = Table("feed", metadata, Column("pk", Integer, primary_key=True), - Column("name", String(255), nullable=False), - Column("url", String(255), nullable=False) + Column("title", String(255), nullable=False), + Column("rss_url", String(255), nullable=False) ) feedEntryTable = Table("feed_entry", metadata,