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

Merge pull request #4923 from inclement/androidjoystick 

Prevented attempted import of AndroidJoystick with SDL2
This commit is contained in:
dessant 2017-01-16 12:58:06 +02:00 committed by GitHub
parent 14625c7d1a 5825230e05
commit 281ff677d4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kivy/input/providers/__init__.py
View File

@ -9,6 +9,7 @@ import os
from kivy.utils import platform as core_platform from kivy.utils import platform as core_platform
from kivy.logger import Logger from kivy.logger import Logger
from kivy.setupconfig import USE_SDL2
import kivy.input.providers.tuio import kivy.input.providers.tuio
import kivy.input.providers.mouse import kivy.input.providers.mouse
@ -52,7 +53,7 @@ if platform == 'linux' or 'KIVY_DOC' in os.environ:
err = 'Input: LinuxWacom is not supported by your version of linux' err = 'Input: LinuxWacom is not supported by your version of linux'
Logger.exception(err) Logger.exception(err)
if platform == 'android' or 'KIVY_DOC' in os.environ: if (platform == 'android' and not USE_SDL2) or 'KIVY_DOC' in os.environ:
try: try:
import kivy.input.providers.androidjoystick import kivy.input.providers.androidjoystick
except: except: