xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-17 21:23:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into switchsupport

Browse Source
This commit is contained in:
Jarrod Johnson 2016-07-14 11:01:07 -04:00
commit 9516efd74a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
confluent_server/confluent/messages.py
View File

@ -19,6 +19,7 @@
# Things are defined here to 'encourage' developers to coordinate information
# format. This is also how different data formats are supported
import confluent.exceptions as exc
from copy import deepcopy
from datetime import datetime
import json
@ -418,7 +419,7 @@ class InputAttributes(ConfluentMessage):
def get_attributes(self, node):
if node not in self.nodeattribs:
return {}
nodeattr = self.nodeattribs[node]
nodeattr = deepcopy(self.nodeattribs[node])
for attr in nodeattr:
if type(nodeattr[attr]) in (str, unicode):
try:
@ -492,7 +493,7 @@ class InputCredential(ConfluentMessage):
def get_attributes(self, node):
if node not in self.credentials:
return {}
credential = self.credentials[node]
credential = deepcopy(self.credentials[node])
for attr in credential:
if type(credential[attr]) in (str, unicode):
try: