JuanCanham/skill-desktop-launcher
1
0
Fork 0
mirror of https://github.com/JuanCanham/skill-desktop-launcher.git synced 2024-11-24 01:30:10 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7 from antlarr/master

Browse Source 
Fix code to work with both python2 and python3
This commit is contained in:
Åke 2018-04-24 14:35:39 +02:00 committed by GitHub
commit 08ad768e6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
__init__.py
View File

@ -17,7 +17,6 @@
import sys import sys
import urllib2
import webbrowser import webbrowser
import subprocess import subprocess
@ -27,6 +26,16 @@ from os.path import dirname, join
from mycroft.skills.core import MycroftSkill from mycroft.skills.core import MycroftSkill
from mycroft.util.log import getLogger from mycroft.util.log import getLogger
if sys.version_info[0] < 3:
from urllib import quote
try:
import gio
except ModuleNotFoundError:
sys.path.append("/usr/lib/python2.7/dist-packages")
import gio
else:
from urllib.parse import quote
from gi.repository import Gio as gio
logger = getLogger(__name__) logger = getLogger(__name__)
__author__ = 'seanfitz' __author__ = 'seanfitz'
@ -40,16 +49,6 @@ class DesktopLauncherSkill(MycroftSkill):
self.appmap = {} self.appmap = {}
def initialize(self): def initialize(self):
try:
import gio
except:
sys.path.append("/usr/lib/python2.7/dist-packages")
try:
import gio
except:
logger.error("Could not import gio")
return
tokenizer = EnglishTokenizer() tokenizer = EnglishTokenizer()
for app in gio.app_info_get_all(): for app in gio.app_info_get_all():
@ -102,13 +101,13 @@ class DesktopLauncherSkill(MycroftSkill):
def handle_launch_website(self, message): def handle_launch_website(self, message):
site = message.data.get("Website") site = message.data.get("Website")
webbrowser.open(IFL_TEMPLATE % (urllib2.quote(site))) webbrowser.open(IFL_TEMPLATE % (quote(site)))
def handle_search_website(self, message): def handle_search_website(self, message):
site = message.data.get("Website") site = message.data.get("Website")
search_terms = message.data.get("SearchTerms") search_terms = message.data.get("SearchTerms")
search_str = site + " " + search_terms search_str = site + " " + search_terms
webbrowser.open(IFL_TEMPLATE % (urllib2.quote(search_str))) webbrowser.open(IFL_TEMPLATE % (quote(search_str)))
def stop(self): def stop(self):
pass pass