sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Replace six.iteritems() with .items()"

Browse Source
This commit is contained in:
Jenkins 2016-12-02 16:38:22 +00:00 committed by Gerrit Code Review
commit 753ac91ec8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/svc-map/extra-data.d/10-merge-svc-map-files
View File

@ -15,7 +15,6 @@
import os import os
import sys import sys
import six
import yaml import yaml
@ -39,7 +38,7 @@ def merge_data(source, destination, distro):
result = dict() result = dict()
result.update(destination) result.update(destination)
family = os_family(distro) family = os_family(distro)
for servicename, mapping in six.iteritems(source): for servicename, mapping in source.items():
if servicename in result: if servicename in result:
raise Exception("%s already found in services list" % servicename) raise Exception("%s already found in services list" % servicename)
if distro in mapping: if distro in mapping: