Skip to contentSkip to conversation

nvmetcli: Correct xrange usage for py3

PATCH Applied Tony Asleson 3 participants 3 messages Apr 1, 2020 – Apr 3, 2020 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvmetcli: Correct xrange usage for py3

If you are in a namespace and simply do a 'create' without specifying a value you will get:

/subsystems/n...f8/namespaces> create
name 'xrange' is not defined
subsystems/n...f8/namespaces>

This is because xrange is not defined in python3 as python3 changed it to range. As the code is already using six use six.move.xrange which works for both python2 & python3.

---
 nvmet/nvme.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
nvmet/nvme.py +3 -3
index db8a03c..83fd75b 100644
@@ -23,7 +23,7 @@ import stat
 import uuid
 import json
 from glob import iglob as glob
-from six import iteritems
+from six import iteritems, moves
 
 DEFAULT_SAVE_FILE = '/etc/nvmet/config.json'
 
@@ -556,7 +556,7 @@ class Namespace(CFSNode):
                 raise CFSError("Need NSID for lookup")
 
             nsids = [n.nsid for n in subsystem.namespaces]
-            for index in xrange(1, self.MAX_NSID + 1):
+            for index in moves.xrange(1, self.MAX_NSID + 1):
                 if index not in nsids:
                     nsid = index
                     break
@@ -816,7 +816,7 @@ class ANAGroup(CFSNode):
                 raise CFSError("Need grpid for lookup")
 
             grpids = [n.grpid for n in port.ana_groups]
-            for index in xrange(2, self.MAX_GRPID + 1):
+            for index in moves.xrange(2, self.MAX_GRPID + 1):
                 if index not in grpids:
                     grpid = index
                     break
Signature · 7 lines
2.25.1


_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme