mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-08-20 13:23:24 -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:
dependabot[bot]
GitHub
parent
cc78f17be5
commit
9f727d0086
18 changed files with 196 additions and 115 deletions
|
|
@ -87,7 +87,7 @@ __license__ = 'MIT'
|
|||
__copyright__ = 'Copyright 2013-2019 Python Charmers Pty Ltd'
|
||||
__ver_major__ = 0
|
||||
__ver_minor__ = 18
|
||||
__ver_patch__ = 2
|
||||
__ver_patch__ = 3
|
||||
__ver_sub__ = ''
|
||||
__version__ = "%d.%d.%d%s" % (__ver_major__, __ver_minor__,
|
||||
__ver_patch__, __ver_sub__)
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ from __future__ import division
|
|||
from __future__ import absolute_import
|
||||
from future.builtins import range
|
||||
from future.builtins import bytes
|
||||
from future.builtins import str
|
||||
|
||||
__all__ = [
|
||||
'body_decode',
|
||||
|
|
|
|||
|
|
@ -225,10 +225,14 @@ LOOSE_HTTP_DATE_RE = re.compile(
|
|||
(?::(\d\d))? # optional seconds
|
||||
)? # optional clock
|
||||
\s*
|
||||
([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+)? # timezone
|
||||
(?:
|
||||
([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+) # timezone
|
||||
\s*
|
||||
(?:\(\w+\))? # ASCII representation of timezone in parens.
|
||||
\s*$""", re.X | re.ASCII)
|
||||
)?
|
||||
(?:
|
||||
\(\w+\) # ASCII representation of timezone in parens.
|
||||
\s*
|
||||
)?$""", re.X | re.ASCII)
|
||||
def http2time(text):
|
||||
"""Returns time in seconds since epoch of time represented by a string.
|
||||
|
||||
|
|
@ -298,9 +302,11 @@ ISO_DATE_RE = re.compile(
|
|||
(?::?(\d\d(?:\.\d*)?))? # optional seconds (and fractional)
|
||||
)? # optional clock
|
||||
\s*
|
||||
([-+]?\d\d?:?(:?\d\d)?
|
||||
|Z|z)? # timezone (Z is "zero meridian", i.e. GMT)
|
||||
\s*$""", re.X | re. ASCII)
|
||||
(?:
|
||||
([-+]?\d\d?:?(:?\d\d)?
|
||||
|Z|z) # timezone (Z is "zero meridian", i.e. GMT)
|
||||
\s*
|
||||
)?$""", re.X | re. ASCII)
|
||||
def iso2time(text):
|
||||
"""
|
||||
As for http2time, but parses the ISO 8601 formats:
|
||||
|
|
|
|||
|
|
@ -46,6 +46,16 @@ def ceil(x):
|
|||
|
||||
from itertools import islice
|
||||
|
||||
if PY26:
|
||||
# itertools.count in Py 2.6 doesn't accept a step parameter
|
||||
def count(start=0, step=1):
|
||||
while True:
|
||||
yield start
|
||||
start += step
|
||||
else:
|
||||
from itertools import count
|
||||
|
||||
|
||||
if PY3:
|
||||
try:
|
||||
from _thread import get_ident
|
||||
|
|
@ -85,6 +95,10 @@ def recursive_repr(fillvalue='...'):
|
|||
return decorating_function
|
||||
|
||||
|
||||
# OrderedDict Shim from Raymond Hettinger, python core dev
|
||||
# http://code.activestate.com/recipes/576693-ordered-dictionary-for-py24/
|
||||
# here to support version 2.6.
|
||||
|
||||
################################################################################
|
||||
### OrderedDict
|
||||
################################################################################
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
``python-future``: pure Python implementation of Python 3 round().
|
||||
"""
|
||||
|
||||
from __future__ import division
|
||||
from future.utils import PYPY, PY26, bind_method
|
||||
|
||||
# Use the decimal module for simplicity of implementation (and
|
||||
|
|
@ -29,28 +30,30 @@ def newround(number, ndigits=None):
|
|||
if hasattr(number, '__round__'):
|
||||
return number.__round__(ndigits)
|
||||
|
||||
if ndigits < 0:
|
||||
raise NotImplementedError('negative ndigits not supported yet')
|
||||
exponent = Decimal('10') ** (-ndigits)
|
||||
|
||||
if PYPY:
|
||||
# Work around issue #24: round() breaks on PyPy with NumPy's types
|
||||
if 'numpy' in repr(type(number)):
|
||||
number = float(number)
|
||||
# Work around issue #24: round() breaks on PyPy with NumPy's types
|
||||
# Also breaks on CPython with NumPy's specialized int types like uint64
|
||||
if 'numpy' in repr(type(number)):
|
||||
number = float(number)
|
||||
|
||||
if isinstance(number, Decimal):
|
||||
d = number
|
||||
else:
|
||||
if not PY26:
|
||||
d = Decimal.from_float(number).quantize(exponent,
|
||||
rounding=ROUND_HALF_EVEN)
|
||||
d = Decimal.from_float(number)
|
||||
else:
|
||||
d = from_float_26(number).quantize(exponent, rounding=ROUND_HALF_EVEN)
|
||||
d = from_float_26(number)
|
||||
|
||||
if ndigits < 0:
|
||||
result = newround(d / exponent) * exponent
|
||||
else:
|
||||
result = d.quantize(exponent, rounding=ROUND_HALF_EVEN)
|
||||
|
||||
if return_int:
|
||||
return int(d)
|
||||
return int(result)
|
||||
else:
|
||||
return float(d)
|
||||
return float(result)
|
||||
|
||||
|
||||
### From Python 2.7's decimal.py. Only needed to support Py2.6:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -10,3 +10,9 @@ else:
|
|||
except ImportError:
|
||||
raise ImportError('The FileDialog module is missing. Does your Py2 '
|
||||
'installation include tkinter?')
|
||||
|
||||
try:
|
||||
from tkFileDialog import *
|
||||
except ImportError:
|
||||
raise ImportError('The tkFileDialog module is missing. Does your Py2 '
|
||||
'installation include tkinter?')
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ from future.types.newobject import newobject
|
|||
|
||||
|
||||
_builtin_dict = dict
|
||||
ver = sys.version_info[:2]
|
||||
ver = sys.version_info
|
||||
|
||||
|
||||
class BaseNewDict(type):
|
||||
|
|
@ -38,47 +38,18 @@ class newdict(with_metaclass(BaseNewDict, _builtin_dict)):
|
|||
"""
|
||||
A backport of the Python 3 dict object to Py2
|
||||
"""
|
||||
def items(self):
|
||||
"""
|
||||
On Python 2.7+:
|
||||
D.items() -> a set-like object providing a view on D's items
|
||||
On Python 2.6:
|
||||
D.items() -> an iterator over D's items
|
||||
"""
|
||||
if ver == (2, 7):
|
||||
return self.viewitems()
|
||||
elif ver == (2, 6):
|
||||
return self.iteritems()
|
||||
elif ver >= (3, 0):
|
||||
return self.items()
|
||||
|
||||
def keys(self):
|
||||
"""
|
||||
On Python 2.7+:
|
||||
D.keys() -> a set-like object providing a view on D's keys
|
||||
On Python 2.6:
|
||||
D.keys() -> an iterator over D's keys
|
||||
"""
|
||||
if ver == (2, 7):
|
||||
return self.viewkeys()
|
||||
elif ver == (2, 6):
|
||||
return self.iterkeys()
|
||||
elif ver >= (3, 0):
|
||||
return self.keys()
|
||||
|
||||
def values(self):
|
||||
"""
|
||||
On Python 2.7+:
|
||||
D.values() -> a set-like object providing a view on D's values
|
||||
On Python 2.6:
|
||||
D.values() -> an iterator over D's values
|
||||
"""
|
||||
if ver == (2, 7):
|
||||
return self.viewvalues()
|
||||
elif ver == (2, 6):
|
||||
return self.itervalues()
|
||||
elif ver >= (3, 0):
|
||||
return self.values()
|
||||
if ver >= (3,):
|
||||
# Inherit items, keys and values from `dict` in 3.x
|
||||
pass
|
||||
elif ver >= (2, 7):
|
||||
items = dict.viewitems
|
||||
keys = dict.viewkeys
|
||||
values = dict.viewvalues
|
||||
else:
|
||||
items = dict.iteritems
|
||||
keys = dict.iterkeys
|
||||
values = dict.itervalues
|
||||
|
||||
def __new__(cls, *args, **kwargs):
|
||||
"""
|
||||
|
|
@ -93,13 +64,7 @@ class newdict(with_metaclass(BaseNewDict, _builtin_dict)):
|
|||
in the keyword argument list. For example: dict(one=1, two=2)
|
||||
"""
|
||||
|
||||
if len(args) == 0:
|
||||
return super(newdict, cls).__new__(cls)
|
||||
elif type(args[0]) == newdict:
|
||||
value = args[0]
|
||||
else:
|
||||
value = args[0]
|
||||
return super(newdict, cls).__new__(cls, value)
|
||||
return super(newdict, cls).__new__(cls, *args)
|
||||
|
||||
def __native__(self):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -284,6 +284,9 @@ class newint(with_metaclass(BaseNewInt, long)):
|
|||
"""
|
||||
So subclasses can override this, Py3-style
|
||||
"""
|
||||
if PY3:
|
||||
return super(newint, self).__bool__()
|
||||
|
||||
return super(newint, self).__nonzero__()
|
||||
|
||||
def __native__(self):
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ class newrange(Sequence):
|
|||
return (isinstance(other, newrange) and
|
||||
(self._len == 0 == other._len or
|
||||
(self._start, self._step, self._len) ==
|
||||
(other._start, other._step, self._len)))
|
||||
(other._start, other._step, other._len)))
|
||||
|
||||
def __len__(self):
|
||||
return self._len
|
||||
|
|
|
|||
|
|
@ -61,6 +61,9 @@ PY3 = sys.version_info[0] >= 3
|
|||
PY34_PLUS = sys.version_info[0:2] >= (3, 4)
|
||||
PY35_PLUS = sys.version_info[0:2] >= (3, 5)
|
||||
PY36_PLUS = sys.version_info[0:2] >= (3, 6)
|
||||
PY37_PLUS = sys.version_info[0:2] >= (3, 7)
|
||||
PY38_PLUS = sys.version_info[0:2] >= (3, 8)
|
||||
PY39_PLUS = sys.version_info[0:2] >= (3, 9)
|
||||
PY2 = sys.version_info[0] == 2
|
||||
PY26 = sys.version_info[0:2] == (2, 6)
|
||||
PY27 = sys.version_info[0:2] == (2, 7)
|
||||
|
|
@ -527,9 +530,9 @@ def implements_iterator(cls):
|
|||
return cls
|
||||
|
||||
if PY3:
|
||||
get_next = lambda x: x.next
|
||||
else:
|
||||
get_next = lambda x: x.__next__
|
||||
else:
|
||||
get_next = lambda x: x.next
|
||||
|
||||
|
||||
def encode_filename(filename):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue