# HG changeset patch # User Martin von Zweigbergk # Date 1562880692 25200 # Node ID 45afcbfea41790589fc4853d0a2ac1bd65c72838 # Parent 92e3db149d7da1c60bebdf8f90bd71e16ac0aebd py3: config values can be bytes, but never unicode diff -r 92e3db149d7d -r 45afcbfea417 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Sat Jul 13 00:17:03 2019 -0700 +++ b/hgext3rd/evolve/__init__.py Thu Jul 11 14:31:32 2019 -0700 @@ -399,7 +399,7 @@ repo.ui.setconfig('experimental', 'evolution', evolveopts, 'evolve') if obsolete.isenabled(repo, 'exchange'): # if no config explicitly set, disable bundle1 - if not isinstance(repo.ui.config('server', 'bundle1'), str): + if not isinstance(repo.ui.config('server', 'bundle1'), bytes): repo.ui.setconfig('server', 'bundle1', False) class trdescrepo(repo.__class__): diff -r 92e3db149d7d -r 45afcbfea417 hgext3rd/evolve/serveronly.py --- a/hgext3rd/evolve/serveronly.py Sat Jul 13 00:17:03 2019 -0700 +++ b/hgext3rd/evolve/serveronly.py Thu Jul 11 14:31:32 2019 -0700 @@ -59,5 +59,5 @@ repo.ui.setconfig('experimental', 'evolution', evolveopts) if obsolete.isenabled(repo, 'exchange'): # if no config explicitly set, disable bundle1 - if not isinstance(repo.ui.config('server', 'bundle1'), str): + if not isinstance(repo.ui.config('server', 'bundle1'), bytes): repo.ui.setconfig('server', 'bundle1', False)