mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-08-14 02:26:58 -07:00
Bump future from 0.18.2 to 0.18.3 (#1970)
* Bump future from 0.18.2 to 0.18.3 Bumps [future](https://github.com/PythonCharmers/python-future) from 0.18.2 to 0.18.3. - [Release notes](https://github.com/PythonCharmers/python-future/releases) - [Changelog](https://github.com/PythonCharmers/python-future/blob/master/docs/changelog.rst) - [Commits](https://github.com/PythonCharmers/python-future/compare/v0.18.2...v0.18.3) --- updated-dependencies: - dependency-name: future dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update future==0.18.3 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> [skip ci]
This commit is contained in:
parent
cc78f17be5
commit
9f727d0086
18 changed files with 196 additions and 115 deletions
|
@ -60,44 +60,15 @@ def newsuper(typ=_SENTINEL, type_or_obj=_SENTINEL, framedepth=1):
|
|||
raise RuntimeError('super() used in a function with no args')
|
||||
|
||||
try:
|
||||
# Get the MRO so we can crawl it.
|
||||
mro = type_or_obj.__mro__
|
||||
except (AttributeError, RuntimeError): # see issue #160
|
||||
typ = find_owner(type_or_obj, f.f_code)
|
||||
except (AttributeError, RuntimeError, TypeError):
|
||||
# see issues #160, #267
|
||||
try:
|
||||
mro = type_or_obj.__class__.__mro__
|
||||
typ = find_owner(type_or_obj.__class__, f.f_code)
|
||||
except AttributeError:
|
||||
raise RuntimeError('super() used with a non-newstyle class')
|
||||
|
||||
# A ``for...else`` block? Yes! It's odd, but useful.
|
||||
# If unfamiliar with for...else, see:
|
||||
#
|
||||
# http://psung.blogspot.com/2007/12/for-else-in-python.html
|
||||
for typ in mro:
|
||||
# Find the class that owns the currently-executing method.
|
||||
for meth in typ.__dict__.values():
|
||||
# Drill down through any wrappers to the underlying func.
|
||||
# This handles e.g. classmethod() and staticmethod().
|
||||
try:
|
||||
while not isinstance(meth,FunctionType):
|
||||
if isinstance(meth, property):
|
||||
# Calling __get__ on the property will invoke
|
||||
# user code which might throw exceptions or have
|
||||
# side effects
|
||||
meth = meth.fget
|
||||
else:
|
||||
try:
|
||||
meth = meth.__func__
|
||||
except AttributeError:
|
||||
meth = meth.__get__(type_or_obj, typ)
|
||||
except (AttributeError, TypeError):
|
||||
continue
|
||||
if meth.func_code is f.f_code:
|
||||
break # Aha! Found you.
|
||||
else:
|
||||
continue # Not found! Move onto the next class in MRO.
|
||||
break # Found! Break out of the search loop.
|
||||
else:
|
||||
raise RuntimeError('super() called outside a method')
|
||||
raise RuntimeError('super() used with an old-style class')
|
||||
except TypeError:
|
||||
raise RuntimeError('super() called outside a method')
|
||||
|
||||
# Dispatch to builtin super().
|
||||
if type_or_obj is not _SENTINEL:
|
||||
|
@ -105,6 +76,34 @@ def newsuper(typ=_SENTINEL, type_or_obj=_SENTINEL, framedepth=1):
|
|||
return _builtin_super(typ)
|
||||
|
||||
|
||||
def find_owner(cls, code):
|
||||
'''Find the class that owns the currently-executing method.
|
||||
'''
|
||||
for typ in cls.__mro__:
|
||||
for meth in typ.__dict__.values():
|
||||
# Drill down through any wrappers to the underlying func.
|
||||
# This handles e.g. classmethod() and staticmethod().
|
||||
try:
|
||||
while not isinstance(meth,FunctionType):
|
||||
if isinstance(meth, property):
|
||||
# Calling __get__ on the property will invoke
|
||||
# user code which might throw exceptions or have
|
||||
# side effects
|
||||
meth = meth.fget
|
||||
else:
|
||||
try:
|
||||
meth = meth.__func__
|
||||
except AttributeError:
|
||||
meth = meth.__get__(cls, typ)
|
||||
except (AttributeError, TypeError):
|
||||
continue
|
||||
if meth.func_code is code:
|
||||
return typ # Aha! Found you.
|
||||
# Not found! Move onto the next class in MRO.
|
||||
|
||||
raise TypeError
|
||||
|
||||
|
||||
def superm(*args, **kwds):
|
||||
f = sys._getframe(1)
|
||||
nm = f.f_code.co_name
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue