Moved handle_facet_parameters call into FacetField's __init__.

Author: tmc

haystack/fields.py

@@ -292,6 +292,10 @@ class FacetField(SearchField):
     """
     instance_name = None
 
+    def __init__(self, **kwargs):
+        handled_kwargs = self.handle_facet_parameters(kwargs)
+        super(FacetField, self).__init__(**handled_kwargs)
+
     def handle_facet_parameters(self, kwargs):
         if kwargs.get('faceted', False):
             raise SearchFieldError("FacetField (%s) does not accept the 'faceted' argument." % self.instance_name)
@@ -321,57 +325,27 @@ def get_facet_for_name(self):
         return self.facet_for or self.instance_name
 
 
-class FacetCharField(CharField, FacetField):
-    field_type = 'string'
-    
-    def __init__(self, **kwargs):
-        handled_kwargs = self.handle_facet_parameters(kwargs)
-        super(FacetCharField, self).__init__(**handled_kwargs)
-
-
-class FacetIntegerField(IntegerField, FacetField):
-    field_type = 'integer'
+class FacetCharField(FacetField, CharField):
+    pass
 
-    def __init__(self, **kwargs):
-        handled_kwargs = self.handle_facet_parameters(kwargs)
-        super(FacetIntegerField, self).__init__(**handled_kwargs)
-
-
-class FacetFloatField(FloatField, FacetField):
-    field_type = 'float'
+class FacetIntegerField(FacetField, IntegerField):
+    pass
 
-    def __init__(self, **kwargs):
-        handled_kwargs = self.handle_facet_parameters(kwargs)
-        super(FacetFloatField, self).__init__(**handled_kwargs)
+class FacetFloatField(FacetField, FloatField):
+    pass
 
 
-class FacetBooleanField(BooleanField, FacetField):
-    field_type = 'boolean'
-    
-    def __init__(self, **kwargs):
-        handled_kwargs = self.handle_facet_parameters(kwargs)
-        super(FacetBooleanField, self).__init__(**handled_kwargs)
+class FacetBooleanField(FacetField, BooleanField):
+    pass
 
 
-class FacetDateField(DateField, FacetField):
-    field_type = 'date'
-    
-    def __init__(self, **kwargs):
-        handled_kwargs = self.handle_facet_parameters(kwargs)
-        super(FacetDateField, self).__init__(**handled_kwargs)
+class FacetDateField(FacetField, DateField):
+    pass
 
 
-class FacetDateTimeField(DateTimeField, FacetField):
-    field_type = 'datetime'
-    
-    def __init__(self, **kwargs):
-        handled_kwargs = self.handle_facet_parameters(kwargs)
-        super(FacetDateTimeField, self).__init__(**handled_kwargs)
+class FacetDateTimeField(FacetField, DateTimeField):
+    pass
 
 
-class FacetMultiValueField(MultiValueField, FacetField):
-    field_type = 'string'
-    
-    def __init__(self, **kwargs):
-        handled_kwargs = self.handle_facet_parameters(kwargs)
-        super(FacetMultiValueField, self).__init__(**handled_kwargs)
+class FacetMultiValueField(FacetField, MultiValueField):
+    pass