[Bf-blender-cvs] [7093e8b40a7] master: Cleanup: remove Python 2.x support from complete_calltip
Campbell Barton
noreply at git.blender.org
Tue Mar 2 07:04:13 CET 2021
Commit: 7093e8b40a732fabf067acaefbb37f2b151519ee
Author: Campbell Barton
Date: Tue Mar 2 17:02:52 2021 +1100
Branches: master
https://developer.blender.org/rB7093e8b40a732fabf067acaefbb37f2b151519ee
Cleanup: remove Python 2.x support from complete_calltip
===================================================================
M release/scripts/modules/console/complete_calltip.py
===================================================================
diff --git a/release/scripts/modules/console/complete_calltip.py b/release/scripts/modules/console/complete_calltip.py
index 611be00b633..4271003ae13 100644
--- a/release/scripts/modules/console/complete_calltip.py
+++ b/release/scripts/modules/console/complete_calltip.py
@@ -107,11 +107,7 @@ def get_argspec(func, strip_self=True, doc=None, source=None):
try:
func = func.__func__
except AttributeError:
- try:
- # py 2.X
- func = func.im_func
- except AttributeError:
- pass
+ pass
# is callable?
if not hasattr(func, '__call__'):
return ''
@@ -141,14 +137,10 @@ def get_argspec(func, strip_self=True, doc=None, source=None):
argspec = inspect.formatargspec(*inspect.getfullargspec(func))
except:
try:
- # py 2.X
- argspec = inspect.formatargspec(*inspect.getargspec(func))
+ argspec = inspect.formatargvalues(
+ *inspect.getargvalues(func))
except:
- try:
- argspec = inspect.formatargvalues(
- *inspect.getargvalues(func))
- except:
- argspec = ''
+ argspec = ''
if strip_self:
argspec = argspec.replace('self, ', '')
return argspec
More information about the Bf-blender-cvs
mailing list