From 789b452e5ee32fbd8e1963889b2e39442d4a8a92 Mon Sep 17 00:00:00 2001
From: "Matthew D. Scholefield" <matthew3311999@gmail.com>
Date: Mon, 28 Aug 2017 14:03:57 -0500
Subject: [PATCH] Add useful imports to mycroft and mycroft.util modules

---
 mycroft/__init__.py      | 6 ++++++
 mycroft/util/__init__.py | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mycroft/__init__.py b/mycroft/__init__.py
index ef3dca40d7..ad5c6044fc 100644
--- a/mycroft/__init__.py
+++ b/mycroft/__init__.py
@@ -1,3 +1,9 @@
+from mycroft.api import Api
+from mycroft.skills.core import MycroftSkill, FallbackSkill, \
+    intent_handler, intent_file_handler
+from mycroft.skills.context import adds_context, removes_context
+from mycroft.messagebus.message import Message
+
 from os.path import abspath, dirname, join
 
 __author__ = 'seanfitz'
diff --git a/mycroft/util/__init__.py b/mycroft/util/__init__.py
index 8225127bf5..b02eb9a12b 100644
--- a/mycroft/util/__init__.py
+++ b/mycroft/util/__init__.py
@@ -15,6 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
 
+# Officially exported methods from this file:
+# play_wav, play_mp3, get_cache_directory,
+# resolve_resource_file, wait_while_speaking
+from mycroft.util.log import getLogger
+from mycroft.util.parse import extract_datetime, extractnumber, normalize
+from mycroft.util.format import nice_number, convert_number
 
 import socket
 import subprocess
@@ -26,7 +32,6 @@ import os.path
 import time
 from stat import S_ISREG, ST_MTIME, ST_MODE, ST_SIZE
 import psutil
-from mycroft.util.log import getLogger
 from mycroft.util.signal import *
 import mycroft.configuration
 import mycroft.audio