aboutsummaryrefslogtreecommitdiff
path: root/rpkid/tests/yamltest.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2012-10-12 22:51:37 +0000
committerRob Austein <sra@hactrn.net>2012-10-12 22:51:37 +0000
commite7d6021d01d8608312713a34bd1954f6e010fe3d (patch)
treef9d5718952d13669c8b6027cfb887dcfefabeb62 /rpkid/tests/yamltest.py
parent72d61753b3ab0096aa66bfce357fbf8c15d4f999 (diff)
Deobfuscate.
svn path=/branches/tk274/; revision=4775
Diffstat (limited to 'rpkid/tests/yamltest.py')
-rw-r--r--rpkid/tests/yamltest.py6
1 files changed, 3 insertions, 3 deletions
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