From fad5dd3eeb37025e96bac6655ed50e5ca528e7f9 Mon Sep 17 00:00:00 2001 From: Ivan Djuricic Date: Tue, 21 May 2019 11:54:31 +0200 Subject: [PATCH 1/3] User agent was not correctly resolved. This is because of ``'useragent' in Config.items('network')`` check. Config.items('network') returns list of tuples so 'useragent' is never in the list. Corrected by using .has_option --- kivy/loader.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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) From 9cb3a652890982cabddc581681a20711fc9ac36f Mon Sep 17 00:00:00 2001 From: Gabriel Pettier Date: Sun, 2 Jun 2019 17:17:11 +0200 Subject: [PATCH 2/3] force to use sphinx 1.7.9 to restore search --- doc/doc-requirements.txt | 1 + 1 file changed, 1 insertion(+) 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 From 06dcc7d7c8584965ed62e562f72ccd2755aa50c1 Mon Sep 17 00:00:00 2001 From: Gabriel Pettier Date: Sun, 2 Jun 2019 19:18:04 +0200 Subject: [PATCH 3/3] also fix sphinx version in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 317214c0f..18144e116 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,7 @@ install: pip install --upgrade cython pillow pytest coveralls docutils PyInstaller; fi; if [ "${RUN}" == "docs" ]; then - pip install --upgrade sphinxcontrib-blockdiag sphinxcontrib-seqdiag sphinxcontrib-actdiag sphinxcontrib-nwdiag; + pip install --upgrade sphinx==1.7.9 sphinxcontrib-blockdiag sphinxcontrib-seqdiag sphinxcontrib-actdiag sphinxcontrib-nwdiag; fi; fi; - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then