x/vmware-nsx
Code Issues Proposed changes

netaddr<=0.7.10 raises ValueError instead of AddrFormatError

Browse Source 
This patch ensures that ValueError is also caught in addition to
AddrFormatError as in netaddr>=0.7.11 AddrFormatError is raised and
in netaddr<=0.7.10 ValueError is raised.

Change-Id: I595c90e42129a2d365f3860e3042e826bd031365
Closes-bug: #1308675
This commit is contained in:
Aaron Rosen 2014-04-16 11:31:25 -07:00 committed by Gerrit Code Review
parent f0e79fcf51
commit cf2c32dd31
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/extensions/securitygroup.py
View File

@ -167,7 +167,7 @@ def convert_ip_prefix_to_cidr(ip_prefix):
try:
cidr = netaddr.IPNetwork(ip_prefix)
return str(cidr)
except (TypeError, netaddr.AddrFormatError):
except (ValueError, TypeError, netaddr.AddrFormatError):
raise qexception.InvalidCIDR(input=ip_prefix)