Skip to content

Commit 261d8d8

Browse files
committed
Removed usage of 'six' since Python 2.x is not supported
Signed-off-by: Mike Raineri <michael.raineri@dell.com>
1 parent fb8ff95 commit 261d8d8

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

src/redfish/ris/rmc.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import os
1111
import re
1212
import sys
13-
import six
1413
import time
1514
import copy
1615
import shutil
@@ -434,7 +433,7 @@ def get_save(self, selector=None, currentoverride=False, pluspath=False,
434433
currdict = jsonpatch.apply_patch(currdict, patch)
435434

436435
if selector:
437-
for item in six.iterkeys(currdict):
436+
for item in currdict:
438437
if selector.lower() == item.lower():
439438
selector = item
440439
break
@@ -510,7 +509,7 @@ def set(self, selector=None, val=None):
510509
nochangesmade = True
511510

512511
currdict = instance.resp.dict
513-
for item in six.iterkeys(currdict):
512+
for item in currdict:
514513
if selector.lower() == item.lower():
515514
selector = item
516515
break
@@ -678,7 +677,7 @@ def loadset(self, dicttolist=None, selector=None, val=None, newargs=None):
678677

679678
if newargs and len(dicttolist)==1 :
680679
for i in range(len(newargs)):
681-
for item in six.iterkeys(currdictcopy):
680+
for item in currdictcopy:
682681
if newarg[i].lower() == item.lower():
683682
newarg[i] = item
684683

@@ -847,7 +846,7 @@ def setmultilevel(self, val=None, newargs=None):
847846
newarg.append(name)
848847

849848
for i in range(len(newargs)):
850-
for item in six.iterkeys(currdictcopy):
849+
for item in currdictcopy:
851850
if newarg[i].lower() == item.lower():
852851
selector = item
853852
newarg[i] = item
@@ -932,15 +931,15 @@ def setmultiworker(self, newargs, change, currdict, current=0):
932931
found = False
933932

934933
if not newargs[current] == newargs[-1]:
935-
for attr, val in six.iteritems(currdict):
934+
for attr, val in currdict.items():
936935
if attr.lower() == newargs[current].lower():
937936
current += 1
938937
found = self.setmultiworker(newargs, change, val, current)
939938
continue
940939
else:
941940
continue
942941
else:
943-
for attr, val in six.iteritems(currdict):
942+
for attr, val in currdict.items():
944943
if attr.lower() == change[0][0].lower():
945944
currdict[attr] = change[0][1]
946945
found = True

0 commit comments

Comments
 (0)