[Fix] Compitable with django 1.11 (#15)

* [Fix] Compitable with Wagtail 1.11

Author: nazmulhasan85

.travis.yml

@@ -3,26 +3,73 @@ cache: pip
 
 matrix:
   include:
-  - env: TOXENV=py35-dj110-wt16
-    python: 3.5
-  - env: TOXENV=py34-dj110-wt16
-    python: 3.4
-  - env: TOXENV=py27-dj110-wt16
-    python: 2.7
-  - env: TOXENV=py35-dj19-wt16
-    python: 3.5
-  - env: TOXENV=py34-dj19-wt16
-    python: 3.4
-  - env: TOXENV=py27-dj19-wt16
-    python: 2.7
-  - env: TOXENV=py35-dj18-wt16
-    python: 3.5
-  - env: TOXENV=py34-dj18-wt16
-    python: 3.4
-  - env: TOXENV=py33-dj18-wt16
-    python: 3.3
-  - env: TOXENV=py27-dj18-wt16
-    python: 2.7
+   # Wagtail 1.8
+    - env: TOXENV=py27-dj18-wt18
+      python: 2.7
+    - env: TOXENV=py34-dj18-wt18
+      python: 3.4
+    - env: TOXENV=py35-dj18-wt18
+      python: 3.5
+    - env: TOXENV=py27-dj110-wt18
+      python: 2.7
+    - env: TOXENV=py34-dj110-wt18
+      python: 3.4
+    - env: TOXENV=py35-dj110-wt18
+      python: 3.5
+
+      # Wagtail 1.9
+    - env: TOXENV=py27-dj18-wt19
+      python: 2.7
+    - env: TOXENV=py34-dj18-wt19
+      python: 3.4
+    - env: TOXENV=py35-dj18-wt19
+      python: 3.5
+    - env: TOXENV=py27-dj110-wt19
+      python: 2.7
+    - env: TOXENV=py34-dj110-wt19
+      python: 3.4
+    - env: TOXENV=py35-dj110-wt19
+      python: 3.5
+
+    # Wagtail 1.10
+    - env: TOXENV=py27-dj18-wt110
+      python: 2.7
+    - env: TOXENV=py34-dj18-wt110
+      python: 3.4
+    - env: TOXENV=py35-dj18-wt110
+      python: 3.5
+    - env: TOXENV=py27-dj110-wt110
+      python: 2.7
+    - env: TOXENV=py34-dj110-wt110
+      python: 3.4
+    - env: TOXENV=py35-dj110-wt110
+      python: 3.5
+    - env: TOXENV=py27-dj111-wt110
+      python: 2.7
+    - env: TOXENV=py34-dj111-wt110
+      python: 3.4
+    - env: TOXENV=py35-dj111-wt110
+      python: 3.5
+
+    # Wagtail 1.11
+    - env: TOXENV=py27-dj18-wt111
+      python: 2.7
+    - env: TOXENV=py34-dj18-wt111
+      python: 3.4
+    - env: TOXENV=py35-dj18-wt111
+      python: 3.5
+    - env: TOXENV=py27-dj110-wt111
+      python: 2.7
+    - env: TOXENV=py34-dj110-wt111
+      python: 3.4
+    - env: TOXENV=py35-dj110-wt111
+      python: 3.5
+    - env: TOXENV=py27-dj111-wt111
+      python: 2.7
+    - env: TOXENV=py34-dj111-wt111
+      python: 3.4
+    - env: TOXENV=py35-dj111-wt111
+      python: 3.5
 install:
   - pip install -U codecov tox
 script:

AUTHORS.rst

@@ -12,3 +12,4 @@ Contributors
 
 * Janneke Janssen
 * Mike Dingjan
+* Nazmul Hasan

tests/test_blocks.py

@@ -3,7 +3,17 @@
 ----------------------------------
 
 Tests for `wagtailsocialfeed.blocks`.
+
+In Wagtail 1.8 Function accepting only one parameter and that's why its raising TypeError
+In Combination of Django 1.11 and Wagtail 1.9, `ImportError` Exception is occurring in wagtailimage.
+
+from django.forms.widgets import flatatt
+ImportError: cannot import name flatatt
+
+because it's moved to utils
+
 """
+
 from __future__ import unicode_literals
 
 from django.test import RequestFactory, TestCase
@@ -63,3 +73,32 @@ def test_render_form(self):
         self.assertEqual(
             soup.find(id='test-feedconfig').find_all('option')[1].text,
             'twitter (@wagtailcms)')
+
+    @feed_response('twitter')
+    def test_get_context_with_parent_context(self, tweets):
+        block = SocialFeedBlock()
+
+        value = {
+            'feedconfig': self.feedconfig,
+            'limit': 3
+        }
+        parent_context = {'has_parent': 'parent context'}
+
+        try:
+            context = block.get_context(value, parent_context)
+            self.assertEqual(context['has_parent'], parent_context['has_parent'])
+            # In Wagtail 1.8 Function accepting only one parameter and that's why its raising TypeError
+        except TypeError:
+            self.skipTest(TestSocialFeedBlock)
+
+    @feed_response('twitter')
+    def test_get_context_without_parent_context(self, tweets):
+        block = SocialFeedBlock()
+
+        value = {
+            'feedconfig': self.feedconfig,
+            'limit': 3
+        }
+
+        context = block.get_context(value)
+        self.assertEqual(context['value'], value)

tox.ini

@@ -4,7 +4,7 @@ skipsdist = True
 usedevelop = True
 
 envlist =
-    py{27,33,34,35}-dj{18,19,110}-wt16
+    py{27,33,34,35}-dj{18,19,110,111}-wt{18,19,110,111}
     flake8
 
 
@@ -16,16 +16,18 @@ commands =
 
 basepython =
     py27: python2.7
-    py33: python3.3
     py34: python3.4
     py35: python3.5
 
 deps =
-    py27: enum34
     dj18: django~=1.8.0
     dj19: django~=1.9.0
     dj110: django~=1.10.0
-    wt16: Wagtail~=1.6.0
+    dj111: django~=1.11.0
+    wt18: wagtail>=1.8,<1.9
+    wt19: wagtail>=1.9,<1.10
+    wt110: wagtail>=1.10,<1.11
+    wt111: wagtail>=1.11,<1.12
 
 
 [testenv:flake8]

wagtailsocialfeed/blocks.py

@@ -48,11 +48,14 @@ class Meta:
         icon = 'icon icon-fa-rss'
         template = 'wagtailsocialfeed/social_feed_block.html'
 
-    def get_context(self, value):
-        context = super(SocialFeedBlock, self).get_context(value)
+    def get_context(self, value, parent_context=None):
+        if not parent_context:
+            context = super(SocialFeedBlock, self).get_context(value)
+        else:
+            context = super(SocialFeedBlock, self).get_context(value, parent_context)
 
         feedconfig = value['feedconfig']
-        feed = None
+
         if feedconfig:
             feed = get_feed_items(feedconfig, limit=value['limit'])
         else:

wagtailsocialfeed/urls.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import, unicode_literals
+
 from django.conf.urls import url
 
 from . import views

wagtailsocialfeed/utils/conf.py

@@ -1,8 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.conf import settings
 from datetime import timedelta
 
+from django.conf import settings
+
 DEFAULTS = {
     'CONFIG': {},
     'CACHE_DURATION': 900,

wagtailsocialfeed/utils/feed/facebook.py

@@ -1,11 +1,11 @@
+from enum import Enum
+
 from dateutil import parser as dateparser
 from django.core.exceptions import ImproperlyConfigured
 from facepy import GraphAPI
-
 from wagtailsocialfeed.utils.conf import get_socialfeed_setting
 
 from . import AbstractFeed, AbstractFeedQuery, FeedItem
-from enum import Enum
 
 
 class PostType(Enum):

wagtailsocialfeed/utils/feed/factory.py

@@ -1,9 +1,9 @@
-from .twitter import TwitterFeed, TwitterFeedItem
-from .instagram import InstagramFeed, InstagramFeedItem
-from .facebook import FacebookFeed, FacebookFeedItem
-
 from collections import namedtuple
 
+from .facebook import FacebookFeed, FacebookFeedItem
+from .instagram import InstagramFeed, InstagramFeedItem
+from .twitter import TwitterFeed, TwitterFeedItem
+
 FeedClasses = namedtuple('FeedClasses', ['feed', 'item'])
 
 FEED_CONFIG = {

wagtailsocialfeed/views.py

@@ -6,7 +6,6 @@
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 from django.views.generic.detail import DetailView
-
 from wagtail.wagtailadmin.forms import SearchForm
 
 from .models import ModeratedItem, SocialFeedConfiguration
@@ -61,6 +60,7 @@ def get_context_data(self, **kwargs):
 
         return context
 
+
 error_messages = {
     'no_original':
         _('The original social feed post was not found in the POST data'),