jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/582965 )

Change subject: [bugfix] user_script_path must be a list ......................................................................

[bugfix] user_script_path must be a list

A tuple cannot be concatenated with a list; otherwise TypeError: can only concatenate tuple (not "list") to tuple occures.

Change-Id: I6b9122cd30532bfa34a5d7d82a9aba9616b5bf60 --- M pwb.py 1 file changed, 2 insertions(+), 2 deletions(-)

Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified

diff --git a/pwb.py b/pwb.py index 228c307..c8dc83e 100755 --- a/pwb.py +++ b/pwb.py @@ -288,10 +288,10 @@ 'scripts.userscripts']

if config.user_script_paths: - if isinstance(config.user_script_paths, (tuple, list)): + if isinstance(config.user_script_paths, list): script_paths = config.user_script_paths + script_paths else: - warn("'user_script_paths' must be a list or tuple,\n" + warn("'user_script_paths' must be a list,\n" 'found: {0}. Ignoring this setting.' .format(type(config.user_script_paths)))