hoelee/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-08-10 10:49:45 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[cleanup] Upgrade syntax

Browse Source 
Using https://github.com/asottile/pyupgrade

1. `__future__` imports and `coding: utf-8` were removed
2. Files were rewritten with `pyupgrade --py36-plus --keep-percent-format`
3. f-strings were cherry-picked from `pyupgrade --py36-plus`

Extractors are left untouched (except removing header) to avoid unnecessary merge conflicts
This commit is contained in:
pukkandan
2022-04-11 20:40:28 +05:30
parent f9934b9614
commit 86e5f3ed2e
1009 changed files with 375 additions and 3224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
yt_dlp/jsinterp.py
View File

@@ -71,7 +71,7 @@ class LocalNameSpace(MutableMapping):
return f'LocalNameSpace{self.stack}'
class JSInterpreter(object):
class JSInterpreter:
def __init__(self, code, objects=None):
if objects is None:
objects = {}
@@ -232,7 +232,7 @@ class JSInterpreter(object):
for default in (False, True):
matched = False
for item in items:
case, stmt = [i.strip() for i in self._separate(item, ':', 1)]
case, stmt = (i.strip() for i in self._separate(item, ':', 1))
if default:
matched = matched or case == 'default'
elif not matched:
@@ -268,10 +268,10 @@ class JSInterpreter(object):
expr = expr[:start] + json.dumps(ret) + expr[end:]
for op, opfunc in _ASSIGN_OPERATORS:
m = re.match(r'''(?x)
(?P<out>%s)(?:\[(?P<index>[^\]]+?)\])?
\s*%s
(?P<expr>.*)$''' % (_NAME_RE, re.escape(op)), expr)
m = re.match(rf'''(?x)
(?P<out>{_NAME_RE})(?:\[(?P<index>[^\]]+?)\])?
\s*{re.escape(op)}
(?P<expr>.*)$''', expr)
if not m:
continue
right_val = self.interpret_expression(m.group('expr'), local_vars, allow_recursion)
@@ -451,9 +451,9 @@ class JSInterpreter(object):
m = re.match(r'^(?P<func>%s)\((?P<args>[a-zA-Z0-9_$,]*)\)$' % _NAME_RE, expr)
if m:
fname = m.group('func')
argvals = tuple([
argvals = tuple(
int(v) if v.isdigit() else local_vars[v]
for v in self._separate(m.group('args'))])
for v in self._separate(m.group('args')))
if fname in local_vars:
return local_vars[fname](argvals)
elif fname not in self._functions: