From cc861068c1ec410363acb2358fe9b638a7bccff7 Mon Sep 17 00:00:00 2001 From: Nicholas Gates Date: Mon, 16 Apr 2018 19:52:44 -0400 Subject: [PATCH] Do not depend on pycodestyle --- pyls/config/config.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pyls/config/config.py b/pyls/config/config.py index 096d6b1e..19ced8c5 100644 --- a/pyls/config/config.py +++ b/pyls/config/config.py @@ -5,9 +5,6 @@ import pluggy from pyls import _utils, hookspecs, uris, PYLS -from .flake8_conf import Flake8Config -from .pycodestyle_conf import PyCodeStyleConfig - log = logging.getLogger(__name__) @@ -25,10 +22,17 @@ def __init__(self, root_uri, init_opts): self._settings = {} self._plugin_settings = {} - self._config_sources = { - 'flake8': Flake8Config(self._root_path), - 'pycodestyle': PyCodeStyleConfig(self._root_path) - } + self._config_sources = {} + try: + from .flake8_conf import Flake8Config + self._config_sources['flake8'] = Flake8Config(self._root_path) + except ImportError: + pass + try: + from .pycodestyle_conf import PyCodeStyleConfig + self._config_sources['pycodestyle'] = PyCodeStyleConfig(self._root_path) + except ImportError: + pass self._pm = pluggy.PluginManager(PYLS) self._pm.trace.root.setwriter(log.debug)