From e7d6021d01d8608312713a34bd1954f6e010fe3d Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 12 Oct 2012 22:51:37 +0000 Subject: Deobfuscate. svn path=/branches/tk274/; revision=4775 --- rpkid/tests/yamltest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rpkid/tests/yamltest.py') diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py index a76abf20..a0903b42 100644 --- a/rpkid/tests/yamltest.py +++ b/rpkid/tests/yamltest.py @@ -205,9 +205,9 @@ class allocation(object): self.roa_requests = [roa_request.parse(y) for y in yaml.get("roa_request", yaml.get("route_origin", ()))] for r in self.roa_requests: if r.v4: - self.base.v4 = self.base.v4.union(r.v4.to_resource_set()) + self.base.v4 |= r.v4.to_resource_set() if r.v6: - self.base.v6 = self.base.v6.union(r.v6.to_resource_set()) + self.base.v6 |= r.v6.to_resource_set() self.hosted_by = yaml.get("hosted_by") self.hosts = [] if not self.is_hosted: @@ -227,7 +227,7 @@ class allocation(object): """ resources = self.base for kid in self.kids: - resources = resources.union(kid.closure()) + resources |= kid.closure() self.resources = resources return resources -- cgit v1.2.3