NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Drop as_dict() method from ChoiceSet

Browse Source
This commit is contained in:
jeremystretch 2021-12-16 10:22:05 -05:00
parent 124302908a
commit 1902ecb8ca
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/reports.py
View File

@ -167,8 +167,8 @@ class Report(object):
""" """
Log a message from a test method. Do not call this method directly; use one of the log_* wrappers below. Log a message from a test method. Do not call this method directly; use one of the log_* wrappers below.
""" """
if level not in LogLevelChoices.as_dict(): if level not in LogLevelChoices.values():
raise Exception("Unknown logging level: {}".format(level)) raise Exception(f"Unknown logging level: {level}")
self._results[self.active_test]['log'].append(( self._results[self.active_test]['log'].append((
timezone.now().isoformat(), timezone.now().isoformat(),
level, level,

2
netbox/extras/templatetags/log_levels.py
View File

@ -12,6 +12,6 @@ def log_level(level):
Display a label indicating a syslog severity (e.g. info, warning, etc.). Display a label indicating a syslog severity (e.g. info, warning, etc.).
""" """
return { return {
'name': LogLevelChoices.as_dict()[level], 'name': dict(LogLevelChoices)[level],
'class': LogLevelChoices.colors.get(level) 'class': LogLevelChoices.colors.get(level)
} }

5
netbox/utilities/choices.py
View File

@ -50,11 +50,6 @@ class ChoiceSet(metaclass=ChoiceSetMeta):
def values(cls): def values(cls):
return [c[0] for c in unpack_grouped_choices(cls._choices)] return [c[0] for c in unpack_grouped_choices(cls._choices)]
@classmethod
def as_dict(cls):
# Unpack grouped choices before casting as a dict
return dict(unpack_grouped_choices(cls._choices))
def unpack_grouped_choices(choices): def unpack_grouped_choices(choices):
""" """

5
netbox/utilities/tests/test_choices.py
View File

@ -30,8 +30,3 @@ class ChoiceSetTestCase(TestCase):
def test_values(self): def test_values(self):
self.assertListEqual(ExampleChoices.values(), ['a', 'b', 'c', 1, 2, 3]) self.assertListEqual(ExampleChoices.values(), ['a', 'b', 'c', 1, 2, 3])
def test_as_dict(self):
self.assertEqual(ExampleChoices.as_dict(), {
'a': 'A', 'b': 'B', 'c': 'C', 1: 'One', 2: 'Two', 3: 'Three'
})