From 8cd79f2ac42bc8586b85d3a16d965aae2b4aedc3 Mon Sep 17 00:00:00 2001
From: Marc Bonnici <marc.bonnici@arm.com>
Date: Wed, 5 Sep 2018 15:25:32 +0100
Subject: [PATCH] fw/instrument: Fix compatibility with Python2
The Python2 inspect module does not contain the `getfullargspec` method so call
the appropriate method depending on Python version.
---
wa/framework/instrument.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/wa/framework/instrument.py b/wa/framework/instrument.py
index ced8c620..4611f86b 100644
--- a/wa/framework/instrument.py
+++ b/wa/framework/instrument.py
@@ -98,6 +98,7 @@ and the code to clear these file goes in teardown method. ::
"""
+import sys
import logging
import inspect
from collections import OrderedDict
@@ -324,7 +325,10 @@ def install(instrument, context):
if not callable(attr):
msg = 'Attribute {} not callable in {}.'
raise ValueError(msg.format(attr_name, instrument))
- argspec = inspect.getfullargspec(attr)
+ if sys.version_info[0] == 3:
+ argspec = inspect.getfullargspec(attr)
+ else:
+ argspec = inspect.getargspec(attr) # pylint: disable=deprecated-method
arg_num = len(argspec.args)
# Instrument callbacks will be passed exactly two arguments: self
# (the instrument instance to which the callback is bound) and