From d76301be95c4414c21db6370c5da9365bcc74bba Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 12 Oct 2016 12:38:11 -0400
Subject: [PATCH] Have range become xrange where available

To have python 2 act more like python 3 and look
like python 3, make range = xrange where xrange exists.

Change-Id: I9918604a619f33682aee3b9896a3bb6afcd8aa8d
---
 pyghmi/ipmi/command.py              | 6 +++---
 pyghmi/ipmi/events.py               | 6 +++---
 pyghmi/ipmi/oem/lenovo/handler.py   | 4 ++--
 pyghmi/ipmi/oem/lenovo/nextscale.py | 4 ++--
 pyghmi/ipmi/private/util.py         | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pyghmi/ipmi/command.py b/pyghmi/ipmi/command.py
index bbcdb815..f1f10f71 100644
--- a/pyghmi/ipmi/command.py
+++ b/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,))
diff --git a/pyghmi/ipmi/events.py b/pyghmi/ipmi/events.py
index f242f230..c97af011 100644
--- a/pyghmi/ipmi/events.py
+++ b/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
diff --git a/pyghmi/ipmi/oem/lenovo/handler.py b/pyghmi/ipmi/oem/lenovo/handler.py
index 8a1ce0d3..a521b976 100755
--- a/pyghmi/ipmi/oem/lenovo/handler.py
+++ b/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:
diff --git a/pyghmi/ipmi/oem/lenovo/nextscale.py b/pyghmi/ipmi/oem/lenovo/nextscale.py
index e2afe115..e088809d 100644
--- a/pyghmi/ipmi/oem/lenovo/nextscale.py
+++ b/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):
diff --git a/pyghmi/ipmi/private/util.py b/pyghmi/ipmi/private/util.py
index fa824958..cd7438fb 100644
--- a/pyghmi/ipmi/private/util.py
+++ b/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: