Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions traitlets/traitlets.py
Original file line number Diff line number Diff line change
Expand Up @@ -1419,9 +1419,15 @@ def validate(self, obj, value):
class Enum(TraitType):
"""An enum that whose value must be in a given sequence."""

def __init__(self, values, default_value=None, **metadata):
def __init__(self, values, default_value=NoDefaultSpecified, allow_none=False, **metadata):
self.values = values
super(Enum, self).__init__(default_value, **metadata)
if default_value is NoDefaultSpecified:
if (not allow_none) and values:
# The first value in a list/tuple, or an arbitrary value from a set
default_value = next(iter(values))
else:
default_value = None
super(Enum, self).__init__(default_value, allow_none=allow_none, **metadata)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could also do

if default_value is NoDefaultSpecified:
    if self.values:
        default_value = next(iter(self.values))
    else:
        default_value  = Undefined

and have it all not depend and allow_none.


def validate(self, obj, value):
if value in self.values:
Expand Down