Optimize imports

Remove unused imports and group local vs external alphabetically

doc/conf.py

@@ -4,10 +4,9 @@
 # Mycroft documentation build configuration file
 #
 
-import os
 import sys
 
-from os import listdir
+import os
 
 sys.path.insert(0, os.path.abspath('../'))
 

mycroft/__init__.py

@@ -1,10 +1,10 @@
+from os.path import abspath, dirname, join
+
 from mycroft.api import Api
+from mycroft.messagebus.message import Message
+from mycroft.skills.context import adds_context, removes_context
 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'
 

mycroft/audio-accuracy-test/audio_accuracy_test.py

@@ -1,10 +1,10 @@
-import os
 import time
 import wave
 from glob import glob
-from os.path import dirname, join
 
+import os
 import pyee
+from os.path import dirname, join
 from speech_recognition import AudioSource
 
 from mycroft.client.speech.listener import RecognizerLoop

mycroft/audio/__init__.py

@@ -1,7 +1,9 @@
-from mycroft.util.signal import check_for_signal
+import time
+
 import psutil
 
-import time
+from mycroft.util.signal import check_for_signal
+
 __author__ = "forslund"
 
 

mycroft/audio/main.py

@@ -16,19 +16,19 @@
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
 
 
+import imp
 import json
-from os.path import expanduser, exists, abspath, dirname, basename, isdir, join
-from os import listdir
 import sys
 import time
-import imp
-import subprocess
 
+from os import listdir
+from os.path import abspath, dirname, basename, isdir, join
+
+import mycroft.audio.speech as speech
 from mycroft.configuration import ConfigurationManager
 from mycroft.messagebus.client.ws import WebsocketClient
 from mycroft.messagebus.message import Message
 from mycroft.util.log import LOG
-import mycroft.audio.speech as speech
 
 try:
     import pulsectl
@@ -90,15 +90,15 @@ def get_services(services_folder):
                     services.append(create_service_descriptor(name))
                 except:
                     LOG.error('Failed to create service from ' + name,
-                                 exc_info=True)
+                              exc_info=True)
         if (not isdir(location) or
                 not MainModule + ".py" in listdir(location)):
             continue
         try:
             services.append(create_service_descriptor(location))
         except:
             LOG.error('Failed to create service from ' + name,
-                         exc_info=True)
+                      exc_info=True)
     return sorted(services, key=lambda p: p.get('name'))
 
 
@@ -125,22 +125,22 @@ def load_services(config, ws, path=None):
                                              *descriptor["info"])
         except:
             LOG.error('Failed to import module ' + descriptor['name'],
-                         exc_info=True)
+                      exc_info=True)
         if (hasattr(service_module, 'autodetect') and
                 callable(service_module.autodetect)):
             try:
                 s = service_module.autodetect(config, ws)
                 service += s
             except:
                 LOG.error('Failed to autodetect...',
-                             exc_info=True)
+                          exc_info=True)
         if (hasattr(service_module, 'load_service')):
             try:
                 s = service_module.load_service(config, ws)
                 service += s
             except:
                 LOG.error('Failed to load service...',
-                             exc_info=True)
+                          exc_info=True)
 
     return service
 

mycroft/audio/services/chromecast/__init__.py

@@ -1,13 +1,12 @@
-from mycroft.messagebus.message import Message
-from mycroft.util.log import LOG
-from mycroft.audio.services import AudioBackend
-from os.path import dirname, abspath, basename
-import sys
 import time
 from mimetypes import guess_type
 
 import pychromecast
 
+from mycroft.audio.services import AudioBackend
+from mycroft.messagebus.message import Message
+from mycroft.util.log import LOG
+
 __author__ = 'forslund'
 
 

mycroft/audio/services/mopidy/__init__.py

@@ -1,10 +1,12 @@
-from mycroft.messagebus.message import Message
-from mycroft.util.log import LOG
-from mycroft.audio.services import AudioBackend
-from os.path import dirname, abspath, basename
 import sys
 import time
 
+from os.path import dirname, abspath
+
+from mycroft.audio.services import AudioBackend
+from mycroft.messagebus.message import Message
+from mycroft.util.log import LOG
+
 __author__ = 'forslund'
 
 sys.path.append(abspath(dirname(__file__)))

mycroft/audio/services/mopidy/mopidypost.py

@@ -1,6 +1,7 @@
-import requests
-from copy import copy
 import json
+from copy import copy
+
+import requests
 
 MOPIDY_API = '/mopidy/rpc'
 

mycroft/audio/services/mpg123/__init__.py

@@ -2,20 +2,18 @@
 from time import sleep
 
 from mycroft.audio.services import AudioBackend
-from mycroft.util.log import LOG
 from mycroft.messagebus.message import Message
-
-from os.path import abspath
+from mycroft.util.log import LOG
 
 __author__ = 'forslund'
 
 
-
 class Mpg123Service(AudioBackend):
     """
         Audio backend for mpg123 player. This one is rather limited and
         only implements basic usage.
     """
+
     def __init__(self, config, emitter, name='mpg123'):
         self.config = config
         self.process = None

mycroft/audio/services/vlc/__init__.py

@@ -1,8 +1,7 @@
-from os.path import dirname, abspath, basename
-from mycroft.audio.services import AudioBackend
-from mycroft.util.log import LOG
 import vlc
 
+from mycroft.audio.services import AudioBackend
+from mycroft.util.log import LOG
 
 
 class VlcService(AudioBackend):

mycroft/audio/speech.py

@@ -1,14 +1,12 @@
-from mycroft.tts import TTSFactory
-from mycroft.util import create_signal, stop_speaking, check_for_signal
-from mycroft.lock import Lock as PIDLock  # Create/Support PID locking file
-from mycroft.configuration import ConfigurationManager
-from mycroft.messagebus.message import Message
-from mycroft.util.log import LOG
-
-from threading import Lock
 import time
+from threading import Lock
+
 import re
 
+from mycroft.configuration import ConfigurationManager
+from mycroft.tts import TTSFactory
+from mycroft.util import create_signal, stop_speaking, check_for_signal
+from mycroft.util.log import LOG
 
 ws = None
 config = None

mycroft/client/enclosure/__init__.py

@@ -25,7 +25,10 @@
 import serial
 
 import mycroft.dialog
+from mycroft.api import has_been_paired
 from mycroft.client.enclosure.arduino import EnclosureArduino
+from mycroft.client.enclosure.display_manager import \
+    initiate_display_manager_ws
 from mycroft.client.enclosure.eyes import EnclosureEyes
 from mycroft.client.enclosure.mouth import EnclosureMouth
 from mycroft.client.enclosure.weather import EnclosureWeather
@@ -36,14 +39,10 @@
     wait_while_speaking
 from mycroft.util.audio_test import record
 from mycroft.util.log import LOG
-from mycroft.client.enclosure.display_manager import \
-    initiate_display_manager_ws
-from mycroft.api import is_paired, has_been_paired
 
 __author__ = 'aatchison', 'jdorleans', 'iward'
 
 
-
 class EnclosureReader(Thread):
     """
     Reads data from Serial port.
@@ -290,7 +289,7 @@ def on_no_internet(self, event=None):
             # One last check to see if connection was established
             return
 
-        if time.time()-Enclosure._last_internet_notification < 30:
+        if time.time() - Enclosure._last_internet_notification < 30:
             # don't bother the user with multiple notifications with 30 secs
             return
 
@@ -387,7 +386,7 @@ def _do_net_check(self):
                                  " Either plug in a network cable or hold the "
                                  "button on top for two seconds, then select "
                                  "wifi from the menu"
-                    }))
+                }))
             else:
                 # Begin the unit startup process, this is the first time it
                 # is being run with factory defaults.

mycroft/client/enclosure/api.py

@@ -15,15 +15,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
 
+from PIL import Image
+
 import mycroft.client.enclosure.display_manager as DisplayManager
 from mycroft.messagebus.message import Message
-from mycroft.util.log import LOG
-from PIL import Image
 
 __author__ = 'jdorleans'
 
-
-
 '''
 API for the functions that affect the Mark I device.
 NOTE: current state management is poorly implemented,

mycroft/client/enclosure/arduino.py

@@ -15,13 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
 
-
-from mycroft.util.log import LOG
-
 __author__ = 'jdorleans'
 
 
-
 class EnclosureArduino:
     """
     Listens to enclosure commands for Mycroft's Arduino.

mycroft/client/enclosure/display_manager.py

@@ -15,11 +15,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
+import json
 from threading import Thread, Timer
+
+import os
+
 from mycroft.messagebus.client.ws import WebsocketClient
 from mycroft.util import get_ipc_directory
-import json
-import os
 from mycroft.util.log import LOG
 
 __author__ = 'connorpenrod', 'michaelnguyen'

mycroft/client/enclosure/eyes.py

@@ -16,12 +16,9 @@
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from mycroft.util.log import LOG
-
 __author__ = 'jdorleans'
 
 
-
 class EnclosureEyes:
     """
     Listens to enclosure commands for Mycroft's Eyes.

mycroft/client/enclosure/main.py

@@ -17,6 +17,7 @@
 
 
 import sys
+
 from mycroft.client.enclosure import Enclosure
 
 

mycroft/client/enclosure/mouth.py

@@ -16,14 +16,11 @@
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from mycroft.util.log import LOG
-from threading import Timer
 import time
 
 __author__ = 'jdorleans'
 
 
-
 class EnclosureMouth:
     """
     Listens to enclosure commands for Mycroft's Mouth.

mycroft/client/enclosure/weather.py

@@ -16,12 +16,9 @@
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from mycroft.util.log import LOG
-
 __author__ = 'iward'
 
 
-
 class EnclosureWeather:
     """
     Listens for Enclosure API commands to display indicators of the weather.
@@ -69,6 +66,6 @@ def display(self, event=None):
 
             temp = event.data.get("temp", None)
             if icon is not None and temp is not None:
-                icon = "x=2,"+icon
+                icon = "x=2," + icon
                 msg = "weather.display=" + str(temp) + "," + str(icon)
                 self.writer.write(msg)

mycroft/client/speech/hotword_factory.py

@@ -15,12 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
 
+import tempfile
+import time
+
+import os
+from os.path import dirname, exists, join, abspath
+
 from mycroft.configuration import ConfigurationManager
 from mycroft.util.log import LOG
-from os.path import dirname, exists, join, abspath
-import os
-import time
-import tempfile
 
 __author__ = 'seanfitz, jdorleans, jarbas'