Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into py2

This commit is contained in:
matham 2019-06-02 13:59:47 -04:00 committed by GitHub
parent 539c873365 06dcc7d7c8
commit 4a162f8459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -72,7 +72,7 @@ install:
pip install --upgrade cython pillow pytest coveralls docutils PyInstaller; pip install --upgrade cython pillow pytest coveralls docutils PyInstaller;
fi; fi;
if [ "${RUN}" == "docs" ]; then 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;
fi; fi;
- if [ "${TRAVIS_OS_NAME}" == "osx" ]; then - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then

1
doc/doc-requirements.txt
View File

@ -1,5 +1,6 @@
Cython>=0.24 Cython>=0.24
# Frozen Sphinx requirements for easier pip installation # Frozen Sphinx requirements for easier pip installation
sphinx==1.7.9
sphinxcontrib-actdiag sphinxcontrib-actdiag
sphinxcontrib-blockdiag sphinxcontrib-blockdiag
sphinxcontrib-nwdiag sphinxcontrib-nwdiag

5
kivy/loader.py
View File

@ -331,10 +331,7 @@ class LoaderBase(object):
else: else:
# read from internet # read from internet
request = urllib_request.Request(filename) request = urllib_request.Request(filename)
if ( if Config.has_option('network', 'useragent'):
Config.has_section('network')
and 'useragent' in Config.items('network')
):
useragent = Config.get('network', 'useragent') useragent = Config.get('network', 'useragent')
if useragent: if useragent:
request.add_header('User-Agent', useragent) request.add_header('User-Agent', useragent)