Fix future conflict with Filter.bind (#344)

Author: rpkilby

rest_framework_filters/filters.py

@@ -59,7 +59,7 @@ def __init__(self, filterset, *args, lookups=None, **kwargs):
         self.filterset = filterset
         self.lookups = lookups or []
 
-    def bind(self, bind_cls):
+    def bind_filterset(self, filterset):
         """
         Bind a filterset class to the filter instance. This class is used for
         relative imports. Only the first bound class is used as filterset
@@ -68,8 +68,8 @@ def bind(self, bind_cls):
         This is also necessary to allow `.filterset` to be resolved during
         FilterSet class creation time, instead of during initialization.
         """
-        if not hasattr(self, 'bind_cls'):
-            self.bind_cls = bind_cls
+        if not hasattr(self, 'bound_filterset'):
+            self.bound_filterset = filterset
 
     def filterset():
         def fget(self):
@@ -79,7 +79,7 @@ def fget(self):
                     self._filterset = import_string(self._filterset)
                 except ImportError:
                     # Fallback to building import path relative to bind class
-                    path = '.'.join([self.bind_cls.__module__, self._filterset])
+                    path = '.'.join([self.bound_filterset.__module__, self._filterset])
                     self._filterset = import_string(path)
             return self._filterset
 

rest_framework_filters/filterset.py

@@ -29,7 +29,7 @@ def __new__(cls, name, bases, attrs):
 
         # See: :meth:`rest_framework_filters.filters.RelatedFilter.bind`
         for name, f in new_class.related_filters.items():
-            f.bind(new_class)
+            f.bind_filterset(new_class)
 
         # Only expand when model is defined. Model may be undefined for mixins.
         if new_class._meta.model is not None: