Skip to content

Commit 0d43636

Browse files
joshNisanthan Nanthakumar
josh
authored and
Nisanthan Nanthakumar
committed
chore: cleanup bitfield (#16031)
1 parent 8ba28ad commit 0d43636

File tree

3 files changed

+1
-134
lines changed

3 files changed

+1
-134
lines changed

src/bitfield/forms.py

-66
This file was deleted.

src/bitfield/models.py

+1-20
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
import six
44

5-
from django.db.models.fields import BigIntegerField, Field
5+
from django.db.models.fields import BigIntegerField
66

7-
from bitfield.forms import BitFormField
87
from bitfield.query import BitQueryExactLookupStub
98
from bitfield.types import Bit, BitHandler
109

@@ -119,10 +118,6 @@ def __init__(self, flags, default=None, *args, **kwargs):
119118
self.flags = flags
120119
self.labels = labels
121120

122-
def formfield(self, form_class=BitFormField, **kwargs):
123-
choices = [(k, self.labels[self.flags.index(k)]) for k in self.flags]
124-
return Field.formfield(self, form_class, choices=choices, **kwargs)
125-
126121
def pre_save(self, instance, add):
127122
value = getattr(instance, self.attname)
128123
return value
@@ -134,20 +129,6 @@ def get_prep_value(self, value):
134129
value = value.mask
135130
return int(value)
136131

137-
def get_db_prep_lookup(self, lookup_type, value, connection, prepared=False):
138-
if isinstance(value, (BitHandler, Bit)):
139-
raise NotImplementedError("get_db_prep_lookup not supported with types Bit, BitHandler")
140-
141-
return BigIntegerField.get_db_prep_lookup(
142-
self, lookup_type=lookup_type, value=value, connection=connection, prepared=prepared
143-
)
144-
145-
def get_prep_lookup(self, lookup_type, value):
146-
if isinstance(value, Bit):
147-
raise NotImplementedError("Lookup type %r not supported with Bit type." % lookup_type)
148-
149-
return BigIntegerField.get_prep_lookup(self, lookup_type, value)
150-
151132
def to_python(self, value):
152133
if isinstance(value, Bit):
153134
value = value.mask

tests/sentry/db/models/fields/bitfield/test_bitfield.py

-48
Original file line numberDiff line numberDiff line change
@@ -367,51 +367,3 @@ def test_added_field(self):
367367
data = pickle.dumps(bf)
368368
inst = pickle.loads(data)
369369
self.assertTrue("FLAG_3" in inst.flags.keys())
370-
371-
372-
class BitFormFieldTest(TestCase):
373-
def test_form_new_invalid(self):
374-
invalid_data_dicts = [
375-
{"flags": ["FLAG_0", "FLAG_FLAG"]},
376-
{"flags": ["FLAG_4"]},
377-
{"flags": [1, 2]},
378-
]
379-
for invalid_data in invalid_data_dicts:
380-
form = BitFieldTestModelForm(data=invalid_data)
381-
self.assertFalse(form.is_valid())
382-
383-
def test_form_new(self):
384-
data_dicts = [{"flags": ["FLAG_0", "FLAG_1"]}, {"flags": ["FLAG_3"]}, {"flags": []}, {}]
385-
for data in data_dicts:
386-
form = BitFieldTestModelForm(data=data)
387-
self.failUnless(form.is_valid())
388-
instance = form.save()
389-
flags = data["flags"] if "flags" in data else []
390-
for k in BitFieldTestModel.flags:
391-
self.assertEquals(bool(getattr(instance.flags, k)), k in flags)
392-
393-
def test_form_update(self):
394-
instance = BitFieldTestModel.objects.create(flags=0)
395-
for k in BitFieldTestModel.flags:
396-
self.assertFalse(bool(getattr(instance.flags, k)))
397-
398-
data = {"flags": ["FLAG_0", "FLAG_1"]}
399-
form = BitFieldTestModelForm(data=data, instance=instance)
400-
self.failUnless(form.is_valid())
401-
instance = form.save()
402-
for k in BitFieldTestModel.flags:
403-
self.assertEquals(bool(getattr(instance.flags, k)), k in data["flags"])
404-
405-
data = {"flags": ["FLAG_2", "FLAG_3"]}
406-
form = BitFieldTestModelForm(data=data, instance=instance)
407-
self.failUnless(form.is_valid())
408-
instance = form.save()
409-
for k in BitFieldTestModel.flags:
410-
self.assertEquals(bool(getattr(instance.flags, k)), k in data["flags"])
411-
412-
data = {"flags": []}
413-
form = BitFieldTestModelForm(data=data, instance=instance)
414-
self.failUnless(form.is_valid())
415-
instance = form.save()
416-
for k in BitFieldTestModel.flags:
417-
self.assertFalse(bool(getattr(instance.flags, k)))

0 commit comments

Comments
 (0)