Squash Merge PR #379 for Django 2.2 support

Author: Asif Saif Uddin <auvipy@gmail.com> Author: jeff <jeff@mighty.com>
2019-07-11 21:57:08 +02:00
parent 11208cedf8
commit 26fac56e31
5 changed files with 37 additions and 24 deletions
@@ -9,8 +9,8 @@ def add_media(dest, media):
    Optimized version of django.forms.Media.__add__() that doesn't create new objects.
    """
    if django.VERSION >= (2, 2):
-        dest._css_lists += media._css_lists
-        dest._js_lists += media._js_lists
+        dest._css_lists.extend(media._css_lists)
+        dest._js_lists.extend(media._js_lists)
    elif django.VERSION >= (2, 0):
        combined = dest + media
        dest._css = combined._css