|
10 | 10 | import os |
11 | 11 | import re |
12 | 12 | import sys |
13 | | -import six |
14 | 13 | import time |
15 | 14 | import copy |
16 | 15 | import shutil |
@@ -434,7 +433,7 @@ def get_save(self, selector=None, currentoverride=False, pluspath=False, |
434 | 433 | currdict = jsonpatch.apply_patch(currdict, patch) |
435 | 434 |
|
436 | 435 | if selector: |
437 | | - for item in six.iterkeys(currdict): |
| 436 | + for item in currdict: |
438 | 437 | if selector.lower() == item.lower(): |
439 | 438 | selector = item |
440 | 439 | break |
@@ -510,7 +509,7 @@ def set(self, selector=None, val=None): |
510 | 509 | nochangesmade = True |
511 | 510 |
|
512 | 511 | currdict = instance.resp.dict |
513 | | - for item in six.iterkeys(currdict): |
| 512 | + for item in currdict: |
514 | 513 | if selector.lower() == item.lower(): |
515 | 514 | selector = item |
516 | 515 | break |
@@ -678,7 +677,7 @@ def loadset(self, dicttolist=None, selector=None, val=None, newargs=None): |
678 | 677 |
|
679 | 678 | if newargs and len(dicttolist)==1 : |
680 | 679 | for i in range(len(newargs)): |
681 | | - for item in six.iterkeys(currdictcopy): |
| 680 | + for item in currdictcopy: |
682 | 681 | if newarg[i].lower() == item.lower(): |
683 | 682 | newarg[i] = item |
684 | 683 |
|
@@ -847,7 +846,7 @@ def setmultilevel(self, val=None, newargs=None): |
847 | 846 | newarg.append(name) |
848 | 847 |
|
849 | 848 | for i in range(len(newargs)): |
850 | | - for item in six.iterkeys(currdictcopy): |
| 849 | + for item in currdictcopy: |
851 | 850 | if newarg[i].lower() == item.lower(): |
852 | 851 | selector = item |
853 | 852 | newarg[i] = item |
@@ -932,15 +931,15 @@ def setmultiworker(self, newargs, change, currdict, current=0): |
932 | 931 | found = False |
933 | 932 |
|
934 | 933 | if not newargs[current] == newargs[-1]: |
935 | | - for attr, val in six.iteritems(currdict): |
| 934 | + for attr, val in currdict.items(): |
936 | 935 | if attr.lower() == newargs[current].lower(): |
937 | 936 | current += 1 |
938 | 937 | found = self.setmultiworker(newargs, change, val, current) |
939 | 938 | continue |
940 | 939 | else: |
941 | 940 | continue |
942 | 941 | else: |
943 | | - for attr, val in six.iteritems(currdict): |
| 942 | + for attr, val in currdict.items(): |
944 | 943 | if attr.lower() == change[0][0].lower(): |
945 | 944 | currdict[attr] = change[0][1] |
946 | 945 | found = True |
|
0 commit comments