diff --git a/.travis.yml b/.travis.yml index 2ecea0cc3..773c4e5e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ install: pip install --upgrade cython pillow pytest coveralls docutils PyInstaller; fi; if [ "${RUN}" == "docs" ]; then - python3 -m pip install --upgrade sphinxcontrib-blockdiag sphinxcontrib-seqdiag sphinxcontrib-actdiag sphinxcontrib-nwdiag; + python3 -m pip install --upgrade sphinx==1.7.9 sphinxcontrib-blockdiag sphinxcontrib-seqdiag sphinxcontrib-actdiag sphinxcontrib-nwdiag; fi; fi; - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then diff --git a/doc/doc-requirements.txt b/doc/doc-requirements.txt index be9dff62a..4eb28efc1 100644 --- a/doc/doc-requirements.txt +++ b/doc/doc-requirements.txt @@ -1,5 +1,6 @@ Cython>=0.24 # Frozen Sphinx requirements for easier pip installation +sphinx==1.7.9 sphinxcontrib-actdiag sphinxcontrib-blockdiag sphinxcontrib-nwdiag diff --git a/kivy/loader.py b/kivy/loader.py index 129e16772..caae04402 100755 --- a/kivy/loader.py +++ b/kivy/loader.py @@ -331,10 +331,7 @@ class LoaderBase(object): else: # read from internet request = urllib_request.Request(filename) - if ( - Config.has_section('network') - and 'useragent' in Config.items('network') - ): + if Config.has_option('network', 'useragent'): useragent = Config.get('network', 'useragent') if useragent: request.add_header('User-Agent', useragent)