Merge pull request #8 from amateja/feature/unification

bitoptions/fields.py

@@ -88,22 +88,5 @@ def to_python(self, value):
         value = super(BitOptionsField, self).to_python(value)
         return BitOptions(self.options.flags, value)
 
-    def get_prep_value(self, value):
-        """
-        Takes current value of the model's attribute, and the method returns
-        data in a format that has been prepared for use as a parameter in
-        a query.
-        """
-        if isinstance(value, BitOptions):
-            return super(BitOptionsField, self).get_prep_value(value.value)
-        return super(BitOptionsField, self).get_prep_value(value)
-
-    def get_prep_lookup(self, lookup_type, value):
-        """
-        Prepares value to the database prior to be used in a lookup.
-        """
-        value = self.get_prep_value(value)
-        return super(BitOptionsField, self).get_prep_lookup(lookup_type, value)
-
 
 SimpleBitOptionsField.register_lookup(BitwiseAnd)

bitoptions/utils.py

@@ -32,6 +32,9 @@ def __iter__(self):
     def __len__(self):
         return len(self._options)
 
+    def __int__(self):
+        return self.value
+
     def get_selected_values(self, selection=None):
         """
         Returns a list of options for the given selection.