patrick/kodi_subsonic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Service will now check for old address format

Browse Source
This commit is contained in:
warwickh
2021-09-29 13:59:54 +10:00
parent 0db8d3b06c
commit 117175d2cc
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/simpleplugin/simpleplugin.py
View File

@ -58,7 +58,7 @@ def _format_vars(variables):
:return: formatted string with sorted ``var = val`` pairs
:rtype: str
"""
var_list = [(var, val) for var, val in iteritems(variables)]
var_list = [(var, val) for var, val in iter(variables.items())]
lines = []
for var, val in sorted(var_list, key=lambda i: i[0]):
if not (var.startswith('__') or var.endswith('__')):
@ -320,7 +320,7 @@ class MemStorage(MutableMapping):
:rtype: str
"""
lines = []
for key, val in iteritems(self):
for key, val in iter(self.items()):
lines.append('{0}: {1}'.format(repr(key), repr(val)))
return ', '.join(lines)
@ -1187,7 +1187,7 @@ class RoutedPlugin(Plugin):
quote_plus(str(arg))
)
# list allows to manipulate the dict during iteration
for key, value in list(iteritems(kwargs)):
for key, value in list(iter(kwargs.items())):
for match in matches[len(args):]:
match_string = match[1:-1]
@ -1327,7 +1327,7 @@ class RoutedPlugin(Plugin):
if match is not None:
kwargs = match.groupdict()
# list allows to manipulate the dict during iteration
for key, value in list(iteritems(kwargs)):
for key, value in list(iter(kwargs.items())):
if key.startswith('int__') or key.startswith('float__'):
del kwargs[key]
if key.startswith('int__'):