valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix {} in ''.format() for python 2.6 which requires an index.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-04-17 12:14:36 +01:00
parent 04374d72d0
commit 31765ec3c9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/utils/socket_util.py
View File

@ -321,22 +321,27 @@ class IPv4Address(object):
self.address_str = address_str
a = self.address_str.split('.')
if len(a) != 4:
raise ValueError("IPv4 addresses must be in dotted-quad form.")
raise ValueError(
'IPv4 addresses must be in dotted-quad form.'
)
try:
self.dotted_quad = [int(a) for a in a]
except ValueError, e:
raise ValueError("IPv4 addresses must be in dotted-quad form. {}".format(e))
raise ValueError(
'IPv4 addresses must be in dotted-quad form. {0}'.format(e)
)
def __str__(self):
return self.address_str
def __repr__(self):
return 'IPv4Address("{}")'.format(str(self))
return 'IPv4Address("{0}")'.format(str(self))
@property
def is_private(self):
'''
:return: Returns True if the address is a non-routable IPv4 address. Otherwise False.
:return: Returns True if the address is a non-routable IPv4 address.
Otherwise False.
'''
if 10 == self.dotted_quad[0]:
return True