Merge pull request #31 from hsiaoyi0504/django-1.11

Update syntax of build_attrs()

filebrowser/fields.py

@@ -38,7 +38,7 @@ def __init__(self, attrs=None):
     def render(self, name, value, attrs=None):
         if value is None:
             value = ""
-        final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
+        final_attrs = self.build_attrs(self.attrs, attrs, type=self.input_type, name=name)
         final_attrs['search_icon'] = os.path.join(
             URL_FILEBROWSER_MEDIA, 'img/filebrowser_icon_show.gif'
         )
@@ -55,6 +55,17 @@ def render(self, name, value, attrs=None):
                 pass
         return render_to_string(_template() + "custom_field.html", locals())
 
+    def build_attrs(self, base_attrs, extra_attrs=None, **kwargs):
+        """
+        Helper function for building an attribute dictionary.
+        Override Widget.build_attrs to support Django<=1.10 and Django>=1.11
+        at the same time.
+        """
+        attrs = dict(base_attrs, **kwargs)
+        if extra_attrs:
+            attrs.update(extra_attrs)
+        return attrs
+
 
 class FileBrowseFormField(forms.CharField):
     default_error_messages = {