Switch back to "or" style for default params in UIManager.setup()

This commit is contained in:
Alex Liebowitz 2016-11-16 15:56:22 -05:00
parent 8b1ea0a6a7
commit 776fe41e03

View file

@ -61,10 +61,9 @@ class UIManager(object):
self.loaded_requirements = None self.loaded_requirements = None
def setup(self, branch=None, check_requirements=None, user_specified=None): def setup(self, branch=None, check_requirements=None, user_specified=None):
local_ui_path = (user_specified if user_specified is not None local_ui_path = user_specified or settings.local_ui_path
else settings.local_ui_path)
self.branch = branch if branch is not None else settings.ui_branch
self.branch = branch or settings.ui_branch
self.check_requirements = (check_requirements if check_requirements is not None self.check_requirements = (check_requirements if check_requirements is not None
else settings.check_ui_requirements) else settings.check_ui_requirements)