salt/version.py: remove raw string formatting

This commit is contained in:
Erik Johnson 2015-08-26 23:26:07 -05:00
parent 538109d146
commit d983434de9

View file

@ -251,7 +251,7 @@ class SaltStackVersion(object):
match = cls.git_describe_regex.match(s)
if not match:
raise ValueError(
'Unable to parse version string: {0!r}'.format(version_string)
'Unable to parse version string: \'{0}\''.format(version_string)
)
return cls(*match.groups())
@ -259,7 +259,7 @@ class SaltStackVersion(object):
def from_name(cls, name):
if name.lower() not in cls.LNAMES:
raise ValueError(
'Named version {0!r} is not known'.format(name)
'Named version \'{0}\' is not known'.format(name)
)
return cls(*cls.LNAMES[name.lower()])
@ -364,7 +364,7 @@ class SaltStackVersion(object):
other = SaltStackVersion(*other)
else:
raise ValueError(
'Cannot instantiate Version from type {0!r}'.format(
'Cannot instantiate Version from type \'{0}\''.format(
type(other)
)
)
@ -405,7 +405,7 @@ class SaltStackVersion(object):
def __repr__(self):
parts = []
if self.name:
parts.append('name={0!r}'.format(self.name))
parts.append('name=\'{0}\''.format(self.name))
parts.extend([
'major={0}'.format(self.major),
'minor={0}'.format(self.minor),