Allow to use separators longer than 1 symbols.

Allow to use not string values.
This commit is contained in:
Alex RootJunior 2019-03-30 22:51:29 +02:00
parent 4cc67ea03a
commit 91ceeed59a

View file

@ -31,10 +31,8 @@ class CallbackData:
raise TypeError(f"Prefix must be instance of str not {type(prefix).__name__}")
elif not prefix:
raise ValueError('Prefix can\'t be empty')
elif len(sep) != 1:
raise ValueError(f"Length of sep should be equals to 1")
elif sep in prefix:
raise ValueError(f"Symbol '{sep}' can't be used in prefix")
raise ValueError(f"Separator '{sep}' can't be used in prefix")
elif not parts:
raise TypeError('Parts is not passed!')
@ -63,14 +61,12 @@ class CallbackData:
else:
raise ValueError(f"Value for '{part}' is not passed!")
if not isinstance(value, str):
raise TypeError(f"Value must be instance of str not {type(value).__name__}")
elif not value:
if not value:
raise ValueError(f"Value for part {part} can't be empty!'")
elif self.sep in value:
raise ValueError(f"Symbol defined as separator can't be used in values of parts")
data.append(value)
data.append(str(value))
if args or kwargs:
raise TypeError('Too many arguments is passed!')