From 50560fc91cb880b7065671a28e945242b4797998 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 9 Nov 2017 13:29:23 +0100 Subject: [PATCH] Python2: Add funcsigs dependency inspect.signature() was added to Python 3.3: add funcsigs on Python 2.7. funcsigs dependency is specific to Python 2.7 and so not installed on Python 3. Change-Id: I951e7df9fcebdc2148cca477f4b064fc9a028e55 Related-Bug: 1726399 --- ospurge/resources/base.py | 6 +++++- requirements.txt | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ospurge/resources/base.py b/ospurge/resources/base.py index 12ad801..b47c473 100644 --- a/ospurge/resources/base.py +++ b/ospurge/resources/base.py @@ -11,7 +11,6 @@ # under the License. import abc import collections -import inspect import logging import threading import time @@ -21,6 +20,11 @@ from typing import Iterable from typing import Optional from typing import TYPE_CHECKING +try: + import funcsigs as inspect # Python 2.7 +except ImportError: + import inspect + from ospurge import exceptions if TYPE_CHECKING: # pragma: no cover diff --git a/requirements.txt b/requirements.txt index 8d130a1..ce9948f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,6 @@ os-client-config>=1.22.0 # Apache-2.0 pbr>=1.8 # Apache-2.0 shade>=1.13.1 typing>=3.5.2.2 # PSF + +# Python 2.7 dependencies +funcsigs; python_version < '3.0'