aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README1
-rw-r--r--piccast/feeds/management/commands/scrape_feeds.py4
-rw-r--r--piccast/feeds/views.py2
3 files changed, 3 insertions, 4 deletions
diff --git a/README b/README
index 3197524..ae71ab9 100644
--- a/README
+++ b/README
@@ -20,6 +20,7 @@ Requirements
The django application requires:
- django 1.1
- python-docutils
+ - python-feedparser
- python 2.6+ (I think? with pysqlite or whatevah?)
JSON API
diff --git a/piccast/feeds/management/commands/scrape_feeds.py b/piccast/feeds/management/commands/scrape_feeds.py
index 1de9e4c..c391470 100644
--- a/piccast/feeds/management/commands/scrape_feeds.py
+++ b/piccast/feeds/management/commands/scrape_feeds.py
@@ -131,7 +131,7 @@ def scrape_feed(feed_shortname):
if(feed_shortname == "acidcow"):
pset['source_url'] = e.guid
elif(feed_shortname == "butdoesitfloat"):
- pset['source_url'] = e.guid
+ pset['source_url'] = e.comments
else:
pset['source_url'] = e.link
pset['created'] = e.date
@@ -180,7 +180,7 @@ def scrape_feed(feed_shortname):
else:
print "ERROR: unknown PicFeed: " + pset['feed']
#parse_page(s['source_url'], httplib.HTTPConnection)
- break # DEBUG
+ #break # DEBUG
###############################################################################
diff --git a/piccast/feeds/views.py b/piccast/feeds/views.py
index daa4a28..f126932 100644
--- a/piccast/feeds/views.py
+++ b/piccast/feeds/views.py
@@ -41,5 +41,3 @@ def pics_by_set(request, req_picset):
json_serializer.serialize(pics)
return HttpResponse(json_serializer.getvalue(), mimetype="application/json")
-def
-