Merge "Avoid clobbering existing class definition"

This commit is contained in:
Jenkins 2014-10-15 17:04:27 +00:00 committed by Gerrit Code Review
commit 8db7282fa0
1 changed files with 2 additions and 1 deletions

View File

@ -119,8 +119,9 @@ def get_server_cls(host):
if netaddr.valid_ipv6(host):
# NOTE(dzyu) make sure use IPv6 sockets if host is in IPv6 pattern
if getattr(server_cls, 'address_family') == socket.AF_INET:
class server_cls(server_cls):
class ipv6_server_cls(server_cls):
address_family = socket.AF_INET6
return ipv6_server_cls
return server_cls