Merge "Have range become xrange where available"

pyghmi/ipmi/command.py

@@ -30,9 +30,9 @@ import socket
 import struct
 
 try:
-    xrange
+    range = xrange
 except NameError:
-    xrange = range
+    pass
 try:
     buffer
 except NameError:
@@ -818,7 +818,7 @@ class Command(object):
         that
         """
         if self._netchannel is None:
-            for channel in chain((0xe, ), xrange(1, 0xc)):
+            for channel in chain((0xe, ), range(1, 0xc)):
                 try:
                     rsp = self.xraw_command(
                         netfn=6, command=0x42, data=(channel,))

pyghmi/ipmi/events.py

@@ -23,9 +23,9 @@ import struct
 import time
 
 try:
-    xrange
+    range = xrange
 except NameError:
-    xrange = range
+    pass
 try:
     buffer
 except NameError:
@@ -309,7 +309,7 @@ def _fix_sel_time(records, ipmicmd):
     lasttimestamp = None
     trimindexes = []
     correctionenabled = True
-    for index in reversed(xrange(len(records))):
+    for index in reversed(range(len(records))):
         record = records[index]
         if 'timecode' not in record or record['timecode'] == 0xffffffff:
             continue

pyghmi/ipmi/oem/lenovo/handler.py

@@ -45,9 +45,9 @@ import socket
 import struct
 import weakref
 try:
-    xrange
+    range = xrange
 except NameError:
-    xrange = range
+    pass
 try:
     buffer
 except NameError:

pyghmi/ipmi/oem/lenovo/nextscale.py

@@ -19,9 +19,9 @@ import pyghmi.ipmi.sdr as sdr
 import struct
 
 try:
-    xrange
+    range = xrange
 except NameError:
-    xrange = range
+    pass
 
 
 def fpc_read_ac_input(ipmicmd):

pyghmi/ipmi/private/util.py

@@ -18,9 +18,9 @@ import socket
 import struct
 
 try:
-    xrange
+    range = xrange
 except NameError:
-    xrange = range
+    pass
 try:
     buffer
 except NameError: