X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=conductor%2Fconductor%2Fdata%2Fplugins%2Ftriage_translator%2Ftriage_translator.py;h=697c64af2cfd574f76ec60a2cc6c5cf641ef2371;hb=41de0bc00450d43af6ad68d7d74eec66ef4ffd7e;hp=f660ad56bcf641a9107dafa9b1917a50f02604c1;hpb=125fece82e5649ca47de3bbfcbd80ce754e21fd3;p=optf%2Fhas.git diff --git a/conductor/conductor/data/plugins/triage_translator/triage_translator.py b/conductor/conductor/data/plugins/triage_translator/triage_translator.py index f660ad5..697c64a 100644 --- a/conductor/conductor/data/plugins/triage_translator/triage_translator.py +++ b/conductor/conductor/data/plugins/triage_translator/triage_translator.py @@ -23,7 +23,11 @@ import json from conductor.common.models.triage_tool import TriageTool from conductor.common.music.model import base from oslo_config import cfg -from StringIO import StringIO +try: + from StringIO import StringIO ## for Python 2 +except ImportError: + from io import StringIO ## for Python 3 + CONF = cfg.CONF io = StringIO() @@ -36,7 +40,7 @@ class TraigeTranslator(object): triage_translator_data['plan_name'] = plan_name triage_translator_data['plan_id'] = plan_id def addDemandsTriageTranslator(self, name, triage_translator_data): - if not 'dropped_candidates' in triage_translator_data.keys(): + if not 'dropped_candidates' in list(triage_translator_data.keys()): # Python 3 Conversion -- dict object to list object triage_translator_data['dropped_candidates'] = [] dropped_candidate_details = {} dropped_candidate_details['name'] = name @@ -45,7 +49,7 @@ class TraigeTranslator(object): triage_translator_data['dropped_candidates'].append(dropped_candidate_details) else: for dc in triage_translator_data['dropped_candidates']: - print name + print(name) # Python 3 conversion as print statement changed from python 2 if not dc['name'] == name: dropped_candidate_details = {} dropped_candidate_details['name'] = name