cc-4105: major reformatting of imports

python_apps/media-monitor2/media/monitor/bootstrap.py

@@ -1,7 +1,7 @@
 import os
-from pydispatch import dispatcher
+from pydispatch           import dispatcher
 from media.monitor.events import NewFile, DeleteFile
-from media.monitor.log import Loggable
+from media.monitor.log    import Loggable
 import media.monitor.pure as mmp
 
 class Bootstrapper(Loggable):

python_apps/media-monitor2/media/monitor/eventcontractor.py

@@ -1,4 +1,4 @@
-from media.monitor.log import Loggable
+from media.monitor.log    import Loggable
 from media.monitor.events import DeleteFile
 
 class EventContractor(Loggable):

python_apps/media-monitor2/media/monitor/eventdrainer.py

@@ -1,5 +1,5 @@
 import socket
-from media.monitor.log import Loggable
+from media.monitor.log     import Loggable
 from media.monitor.toucher import RepeatTimer
 
 class EventDrainer(Loggable):

python_apps/media-monitor2/media/monitor/events.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import os
 import abc
-from media.monitor.pure import LazyProperty
 import media.monitor.pure as mmp
-from media.monitor.metadata import Metadata
+from media.monitor.pure       import LazyProperty
-from media.monitor.log import Loggable
+from media.monitor.metadata   import Metadata
+from media.monitor.log        import Loggable
 from media.monitor.exceptions import BadSongFile
 
 class PathChannel(object):

python_apps/media-monitor2/media/monitor/manager.py

@@ -1,11 +1,11 @@
 import pyinotify
 from pydispatch import dispatcher
 
-from os.path import normpath
+from os.path                 import normpath
-from media.monitor.events import PathChannel
+from media.monitor.events    import PathChannel
-from media.monitor.log import Loggable
+from media.monitor.log       import Loggable
 from media.monitor.listeners import StoreWatchListener, OrganizeListener
-from media.monitor.handler import ProblemFileHandler
+from media.monitor.handler   import ProblemFileHandler
 from media.monitor.organizer import Organizer
 import media.monitor.pure as mmp
 

python_apps/media-monitor2/media/monitor/metadata.py

@@ -5,7 +5,7 @@ import os
 import copy
 
 from media.monitor.exceptions import BadSongFile
-from media.monitor.log import Loggable
+from media.monitor.log        import Loggable
 import media.monitor.pure as mmp
 
 """

python_apps/media-monitor2/media/monitor/organizer.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from media.monitor.handler import ReportHandler
 import media.monitor.pure as mmp
-from media.monitor.log import Loggable
+from media.monitor.handler    import ReportHandler
+from media.monitor.log        import Loggable
 from media.monitor.exceptions import BadSongFile
 
 class Organizer(ReportHandler,Loggable):

python_apps/media-monitor2/media/monitor/pure.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 import copy
 import os
-from os.path import normpath
 import shutil
-from itertools import takewhile
 import sys
 import hashlib
-from configobj import ConfigObj
 import locale
 
+from os.path   import normpath
+from itertools import takewhile
+from configobj import ConfigObj
+
 from media.monitor.exceptions import FailedToSetLocale, FailedToCreateDir
 
 supported_extensions =  [u"mp3", u"ogg", u"oga"]

python_apps/media-monitor2/media/monitor/syncdb.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import os
-from media.monitor.log import Loggable
+from media.monitor.log        import Loggable
 from media.monitor.exceptions import NoDirectoryInAirtime
+from os.path                  import normpath
 import media.monitor.pure as mmp
-from os.path import normpath
 
 class AirtimeDB(Loggable):
     def __init__(self, apc, reload_now=True):

python_apps/media-monitor2/media/monitor/toucher.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import media.monitor.pure as mmp
 import os
-from media.monitor.log import Loggable
+from media.monitor.log        import Loggable
 from media.monitor.exceptions import CouldNotCreateIndexFile
 
 class Toucher(Loggable):

python_apps/media-monitor2/media/monitor/watchersyncer.py

@@ -4,10 +4,10 @@ import time
 import copy
 import traceback
 
-from media.monitor.handler import ReportHandler
+from media.monitor.handler         import ReportHandler
-from media.monitor.log import Loggable
+from media.monitor.log             import Loggable
-from media.monitor.exceptions import BadSongFile
+from media.monitor.exceptions      import BadSongFile
-from media.monitor.pure import LazyProperty
+from media.monitor.pure            import LazyProperty
 from media.monitor.eventcontractor import EventContractor
 
 import api_clients.api_client as ac