From ff38a5f7192f33a3aa79be6fa76753f9d3e695e5 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 13 Aug 2012 17:38:52 -0400 Subject: [PATCH] cc-4105: major reformatting of imports --- python_apps/media-monitor2/media/monitor/bootstrap.py | 4 ++-- .../media-monitor2/media/monitor/eventcontractor.py | 2 +- python_apps/media-monitor2/media/monitor/eventdrainer.py | 2 +- python_apps/media-monitor2/media/monitor/events.py | 6 +++--- python_apps/media-monitor2/media/monitor/manager.py | 8 ++++---- python_apps/media-monitor2/media/monitor/metadata.py | 2 +- python_apps/media-monitor2/media/monitor/organizer.py | 4 ++-- python_apps/media-monitor2/media/monitor/pure.py | 7 ++++--- python_apps/media-monitor2/media/monitor/syncdb.py | 4 ++-- python_apps/media-monitor2/media/monitor/toucher.py | 2 +- python_apps/media-monitor2/media/monitor/watchersyncer.py | 8 ++++---- 11 files changed, 25 insertions(+), 24 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/bootstrap.py b/python_apps/media-monitor2/media/monitor/bootstrap.py index 06f8f7f2c..6f52113cd 100644 --- a/python_apps/media-monitor2/media/monitor/bootstrap.py +++ b/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): diff --git a/python_apps/media-monitor2/media/monitor/eventcontractor.py b/python_apps/media-monitor2/media/monitor/eventcontractor.py index 89bb16f88..0de3d224c 100644 --- a/python_apps/media-monitor2/media/monitor/eventcontractor.py +++ b/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): diff --git a/python_apps/media-monitor2/media/monitor/eventdrainer.py b/python_apps/media-monitor2/media/monitor/eventdrainer.py index 4fabc339b..ea75132c6 100644 --- a/python_apps/media-monitor2/media/monitor/eventdrainer.py +++ b/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): diff --git a/python_apps/media-monitor2/media/monitor/events.py b/python_apps/media-monitor2/media/monitor/events.py index 214f2230a..4824b9b11 100644 --- a/python_apps/media-monitor2/media/monitor/events.py +++ b/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.log import Loggable +from media.monitor.pure import LazyProperty +from media.monitor.metadata import Metadata +from media.monitor.log import Loggable from media.monitor.exceptions import BadSongFile class PathChannel(object): diff --git a/python_apps/media-monitor2/media/monitor/manager.py b/python_apps/media-monitor2/media/monitor/manager.py index 8d2e8c035..612e9983a 100644 --- a/python_apps/media-monitor2/media/monitor/manager.py +++ b/python_apps/media-monitor2/media/monitor/manager.py @@ -1,11 +1,11 @@ import pyinotify from pydispatch import dispatcher -from os.path import normpath -from media.monitor.events import PathChannel -from media.monitor.log import Loggable +from os.path import normpath +from media.monitor.events import PathChannel +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 diff --git a/python_apps/media-monitor2/media/monitor/metadata.py b/python_apps/media-monitor2/media/monitor/metadata.py index 7a4bc697b..7d9d4c294 100644 --- a/python_apps/media-monitor2/media/monitor/metadata.py +++ b/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 """ diff --git a/python_apps/media-monitor2/media/monitor/organizer.py b/python_apps/media-monitor2/media/monitor/organizer.py index 99302f171..011383c39 100644 --- a/python_apps/media-monitor2/media/monitor/organizer.py +++ b/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): diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 6b5acf946..4b91f2f02 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/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"] diff --git a/python_apps/media-monitor2/media/monitor/syncdb.py b/python_apps/media-monitor2/media/monitor/syncdb.py index 8206daeed..1f3674e53 100644 --- a/python_apps/media-monitor2/media/monitor/syncdb.py +++ b/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): diff --git a/python_apps/media-monitor2/media/monitor/toucher.py b/python_apps/media-monitor2/media/monitor/toucher.py index 4e0a365ff..cd20a21f0 100644 --- a/python_apps/media-monitor2/media/monitor/toucher.py +++ b/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): diff --git a/python_apps/media-monitor2/media/monitor/watchersyncer.py b/python_apps/media-monitor2/media/monitor/watchersyncer.py index c0a1b4416..faea2600d 100644 --- a/python_apps/media-monitor2/media/monitor/watchersyncer.py +++ b/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.log import Loggable -from media.monitor.exceptions import BadSongFile -from media.monitor.pure import LazyProperty +from media.monitor.handler import ReportHandler +from media.monitor.log import Loggable +from media.monitor.exceptions import BadSongFile +from media.monitor.pure import LazyProperty from media.monitor.eventcontractor import EventContractor import api_clients.api_client as ac