do not include non-feed posts on homepage

[chloro.git] / chloro / monkeypatch.py

diff --git a/chloro/monkeypatch.py b/chloro/monkeypatch.py
index 436b0cd35949c0de6765fe1608917281c389b0b4..7802236d76082610575b3634405685328be1e43b 100644 (file)
--- a/chloro/monkeypatch.py
+++ b/chloro/monkeypatch.py
@@ -14,20 +14,19 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.core.urlresolvers import reverse
+import ckeditor.views
+import ckeditor.widgets
+from ckeditor.image import pillow_backend
 from django.forms.utils import flatatt
 from django.template.loader import render_to_string
-from django.utils.encoding import force_text
+from django.urls import reverse
+from django.utils.encoding import force_str
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language
 
-import ckeditor.views
-import ckeditor.widgets
-from ckeditor.image import pillow_backend
-
 
-def ckeditor_render(self, name, value, attrs=None):
+def ckeditor_render(self, name, value, attrs=None, renderer=None):
     if value is None:
         value = ''
     final_attrs = {'name': name}
@@ -44,7 +43,7 @@ def ckeditor_render(self, name, value, attrs=None):
 
     # Force to text to evaluate possible lazy objects
     external_plugin_resources = [
-        [force_text(a), force_text(b), force_text(c)] for a, b, c in self.external_plugin_resources
+        [force_str(a), force_str(b), force_str(c)] for a, b, c in self.external_plugin_resources
     ]
 
     return mark_safe(
@@ -52,7 +51,7 @@ def ckeditor_render(self, name, value, attrs=None):
             'ckeditor/widget.html',
             {
                 'final_attrs': flatatt(final_attrs),
-                'value': conditional_escape(force_text(value)),
+                'value': conditional_escape(force_str(value)),
                 'id': final_attrs['id'],
                 'config': ckeditor.widgets.json_encode(self.config),
                 'external_plugin_resources': ckeditor.widgets.json_encode(external_plugin_resources),