ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix compatibility issues

Browse source
This commit is contained in:
Iacopo Spalletti 2016-05-01 21:38:54 +02:00
parent 6228e07fac
commit 517874892a
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
djangocms_blog/cms_menus.py
View file

@ -3,7 +3,6 @@ from __future__ import absolute_import, print_function, unicode_literals
from cms.apphook_pool import apphook_pool
from cms.menu_bases import CMSAttachMenu
from django.contrib.sites.shortcuts import get_current_site
from django.core.urlresolvers import resolve
from django.db.models.signals import post_delete, post_save
from django.utils.translation import get_language_from_request, ugettext_lazy as _
@ -14,6 +13,11 @@ from .cms_appconfig import BlogConfig
from .models import BlogCategory, Post
from .settings import MENU_TYPE_CATEGORIES, MENU_TYPE_COMPLETE, MENU_TYPE_POSTS, get_setting
try:
from django.contrib.sites.shortcuts import get_current_site
except ImportError:
from django.contrib.sites.models import get_current_site
class BlogCategoryMenu(CMSAttachMenu):
"""

9
djangocms_blog/feeds.py
View file

@ -19,15 +19,14 @@ from djangocms_blog.views import PostDetailView
from .models import Post
try:
import HTMLParser
h = HTMLParser.HTMLParser()
except ImportError:
import html.parser
from html.parser import HTMLParser
h = html.parser()
h = HTMLParser()
class LatestEntriesFeed(Feed):
@ -46,7 +45,7 @@ class LatestEntriesFeed(Feed):
return Site.objects.get_current().name
def description(self):
return _('Blog articles on {site_name}').format(site_name=Site.objects.get_current().name)
return _('Blog articles on %(site_name)s') % {'site_name': Site.objects.get_current().name}
def items(self, obj=None):
return Post.objects.namespace(
@ -100,7 +99,7 @@ class FBInstantFeed(Rss201rev2Feed):
handler.addQuickElement('link', self.feed['link'])
handler.addQuickElement('description', self.feed['description'])
if self.feed['language'] is not None:
handler.addQuickElement('language', 'it-it')#self.feed['language'])
handler.addQuickElement('language', 'it-it')
for cat in self.feed['categories']:
handler.addQuickElement('category', cat)
if self.feed['feed_copyright'] is not None: