URL: https://github.com/freeipa/freeipa/pull/142 Author: dkupka Title: #142: CheckedIPAddress: Implement __(g|s)etstate__ and to ensure proper (un)pickling Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/142/head:pr142 git checkout pr142
From 7d60c47bdb2022c107bb60826e76ae21d746aeb9 Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Thu, 6 Oct 2016 13:31:52 +0200 Subject: [PATCH] UnsafeIPAddress: Implement __(g|s)etstate__ and to ensure proper (un)pickling Missing attributes in instance created by pickle.load cause AttributeError in second part of ipa-server-install --external-ca. https://fedorahosted.org/freeipa/ticket/6385 --- ipapython/ipautil.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 41544a1..e4f4f39 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -127,12 +127,24 @@ def __init__(self, addr): super(UnsafeIPAddress, self).__init__(addr, flags=self.netaddr_ip_flags) + def __getstate__(self): + state = { + '_net': self._net, + 'super_state': super(UnsafeIPAddress, self).__getstate__(), + } + return state + + def __setstate__(self, state): + super(UnsafeIPAddress, self).__setstate__(state.pop('super_state')) + self._net = state['_net'] + class CheckedIPAddress(UnsafeIPAddress): """IPv4 or IPv6 address with additional constraints. Reserved or link-local addresses are never accepted. """ + def __init__(self, addr, match_local=False, parse_netmask=True, allow_loopback=False, allow_multicast=False): try: @@ -142,6 +154,7 @@ def __init__(self, addr, match_local=False, parse_netmask=True, if isinstance(addr, CheckedIPAddress): self.prefixlen = addr.prefixlen + self._net = addr._net return if not parse_netmask and self._net: @@ -205,6 +218,17 @@ def __init__(self, addr, match_local=False, parse_netmask=True, self.prefixlen = self._net.prefixlen + def __getstate__(self): + state = { + 'prefixlen': self.prefixlen, + 'super_state': super(CheckedIPAddress, self).__getstate__(), + } + return state + + def __setstate__(self, state): + super(CheckedIPAddress, self).__setstate__(state.pop('super_state')) + self.prefixlen = state['prefixlen'] + def is_network_addr(self): return self == self._net.network
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
