From 338551fa63ccf0e12121da2429ab1eae16636881 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Mon, 24 Sep 2018 08:23:10 -0600 Subject: Update getargspec patch: actually use getfullargspec If able to import getfullargspec, use it to read args. Previous version still used getargspec, which might not be imported. Signed-off-by: Mats Wichmann --- src/engine/SCons/Tool/packaging/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/engine/SCons/Tool/packaging/__init__.py b/src/engine/SCons/Tool/packaging/__init__.py index 26302a6..4c92022 100644 --- a/src/engine/SCons/Tool/packaging/__init__.py +++ b/src/engine/SCons/Tool/packaging/__init__.py @@ -27,14 +27,15 @@ SCons Packaging Tool. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import SCons.Defaults import SCons.Environment from SCons.Variables import * from SCons.Errors import * from SCons.Util import is_List, make_path_relative from SCons.Warnings import warn, Warning -import os, imp -import SCons.Defaults +import os +import imp __all__ = [ 'src_targz', 'src_tarbz2', 'src_zip', 'tarbz2', 'targz', 'zip', 'rpm', 'msi', 'ipk' ] @@ -166,9 +167,10 @@ def Package(env, target=None, source=None, **kw): #TODO: getargspec deprecated in Py3. cleanup when Py2.7 dropped. try: from inspect import getfullargspec + argspec = getfullargspec(packager.package) except ImportError: from inspect import getargspec - argspec = getargspec(packager.package) + argspec = getargspec(packager.package) args = argspec.args if argspec.defaults: # throw away arguments with default values -- cgit v0.12