Diverse Code Cleanups

*Code wurde PEP-8 gerecht formatiert
* Kleine Fehler die der PyCharm Inspector beanstandet wurden korrigiert
This commit is contained in:
Christian Berg
2014-11-26 16:04:52 +01:00
committed by Christian Berg
parent f34281089d
commit 86a0db050d
76 changed files with 619 additions and 528 deletions

View File

@@ -1,8 +1,8 @@
'''
"""
Created on 05.02.2011
@author: christian
'''
"""
from datetime import datetime, timedelta
from django.conf import settings
@@ -14,8 +14,8 @@ import django.db.models
import feedparser
import urllib2
class FeedManager(django.db.models.Manager):
class FeedManager(django.db.models.Manager):
def active(self):
site = settings.SITE_ID
feeds = self.filter(is_functional=True, site=site)
@@ -28,12 +28,13 @@ class FeedManager(django.db.models.Manager):
feed.parse()
return feeds
class FeedItemManager(django.db.models.Manager):
class FeedItemManager(django.db.models.Manager):
def recent_items(self, max_items=10, site=None):
site = site or settings.SITE_ID
return self.select_related().filter(feed__site=site)[:max_items]
class Feed(models.Model):
title = models.CharField(max_length=500)
site = models.ForeignKey(Site)
@@ -61,19 +62,22 @@ class Feed(models.Model):
link = feed_entry.link
guid = feed_entry.get("id", link)
summary = html_parser.unescape(feed_entry.get("summary",
feed_entry.get("description", feed_entry.get("content", u""))
))
summary = html_parser.unescape(
feed_entry.get("summary", feed_entry.get(
"description",
feed_entry.get("content", u"")
))
)
date_modified = feed_entry.get("published_parsed", parsed_feed.get("published_parsed", timezone.now))
date_modified = timezone.make_aware(datetime(*date_modified[:6]), timezone.get_current_timezone())
feed_item, updated = self.feed_items.get_or_create(guid=guid,
defaults={
'title': title,
'link': link,
'summary': summary,
'date_modified': date_modified
})
defaults={
'title': title,
'link': link,
'summary': summary,
'date_modified': date_modified
})
feed_item.save()
self.last_update = timezone.now()
return self.save()