MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update for pep8

pull/458/head
Ethan Ward 2016-12-20 15:19:22 -06:00 committed by Augusto Monteiro
parent 93893f3473
commit 451f0f5195
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mycroft/skills/core.py
View File

@ -37,7 +37,9 @@ __author__ = 'seanfitz'
PRIMARY_SKILLS = ['intent', 'wake'] PRIMARY_SKILLS = ['intent', 'wake']
BLACKLISTED_SKILLS = ["send_sms", "media"] BLACKLISTED_SKILLS = ["send_sms", "media"]
SKILLS_BASEDIR = dirname(__file__) SKILLS_BASEDIR = dirname(__file__)
THIRD_PARTY_SKILLS_DIR = ["/opt/mycroft/third_party", "/opt/mycroft/skills"] # Note: /opt/mycroft/skills is recommended, /opt/mycroft/third_party is for backwards compatibility THIRD_PARTY_SKILLS_DIR = ["/opt/mycroft/third_party", "/opt/mycroft/skills"]
# Note: /opt/mycroft/skills is recommended, /opt/mycroft/third_party
# is for backwards compatibility
MainModule = '__init__' MainModule = '__init__'
@ -118,7 +120,7 @@ def get_skills(skills_folder):
for i in possible_skills: for i in possible_skills:
location = join(skills_folder, i) location = join(skills_folder, i)
if (isdir(location) and if (isdir(location) and
not MainModule + ".py" in os.listdir(location)): not MainModule + ".py" in os.listdir(location)):
for j in os.listdir(location): for j in os.listdir(location):
name = join(location, j) name = join(location, j)
if (not isdir(name) or if (not isdir(name) or
@ -146,8 +148,8 @@ def load_skills(emitter, skills_root=SKILLS_BASEDIR):
load_skill(skill, emitter) load_skill(skill, emitter)
for skill in skills: for skill in skills:
if (skill['name'] not in PRIMARY_SKILLS and skill['name'] not in if (skill['name'] not in PRIMARY_SKILLS and
BLACKLISTED_SKILLS): skill['name'] not in BLACKLISTED_SKILLS):
load_skill(skill, emitter) load_skill(skill, emitter)

2
mycroft/skills/main.py
View File

@ -44,7 +44,7 @@ def load_skills_callback():
for loc in THIRD_PARTY_SKILLS_DIR: for loc in THIRD_PARTY_SKILLS_DIR:
if exists(loc): if exists(loc):
load_skills(client, loc) load_skills(client, loc)
if ini_third_party_skills_dir and exists(ini_third_party_skills_dir): if ini_third_party_skills_dir and exists(ini_third_party_skills_dir):
load_skills(ws, ini_third_party_skills_dir) load_skills(ws, ini_third_party_skills_dir)