From dad54d5db50c8ad0e1e1b65aece997afbe644944 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 11 Oct 2016 11:00:59 -0400 Subject: [PATCH] Check for buffer and use memoryview if missing Python 3 does not implement buffer. Use memoryview as a standin if buffer would induce a NameError. Change-Id: Id36e8253fffee9dc22bd982e00554f1c25bc95b4 --- pyghmi/ipmi/command.py | 4 ++++ pyghmi/ipmi/events.py | 4 ++++ pyghmi/ipmi/oem/lenovo/handler.py | 4 ++++ pyghmi/ipmi/private/util.py | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/pyghmi/ipmi/command.py b/pyghmi/ipmi/command.py index 732d5d13..31fd6b16 100644 --- a/pyghmi/ipmi/command.py +++ b/pyghmi/ipmi/command.py @@ -33,6 +33,10 @@ try: xrange except NameError: xrange = range +try: + buffer +except NameError: + buffer = memoryview boot_devices = { diff --git a/pyghmi/ipmi/events.py b/pyghmi/ipmi/events.py index 91fd2450..f242f230 100644 --- a/pyghmi/ipmi/events.py +++ b/pyghmi/ipmi/events.py @@ -26,6 +26,10 @@ try: xrange except NameError: xrange = range +try: + buffer +except NameError: + buffer = memoryview psucfg_errors = { diff --git a/pyghmi/ipmi/oem/lenovo/handler.py b/pyghmi/ipmi/oem/lenovo/handler.py index 2e595e87..4852afbe 100755 --- a/pyghmi/ipmi/oem/lenovo/handler.py +++ b/pyghmi/ipmi/oem/lenovo/handler.py @@ -48,6 +48,10 @@ try: xrange except NameError: xrange = range +try: + buffer +except NameError: + buffer = memoryview inventory.register_inventory_category(cpu) inventory.register_inventory_category(dimm) diff --git a/pyghmi/ipmi/private/util.py b/pyghmi/ipmi/private/util.py index 46ec5127..33ac88a7 100644 --- a/pyghmi/ipmi/private/util.py +++ b/pyghmi/ipmi/private/util.py @@ -21,6 +21,10 @@ try: xrange except NameError: xrange = range +try: + buffer +except NameError: + buffer = memoryview def decode_wireformat_uuid(rawguid):