cleanup imports

oml/item/api.py

@@ -2,26 +2,20 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 
-import os
 import json
 import hashlib
 
-from oxtornado import actions
-
 from sqlalchemy.orm import load_only
 
-import query
-
+from oxtornado import actions
+from utils import cleanup_id
+from websocket import trigger_event
+import metaremote as meta
 import models
+import query
 import settings
 import state
-from websocket import trigger_event
-
-#import meta
-import metaremote as meta
-
 import utils
-from utils import cleanup_id
 
 import logging
 logger = logging.getLogger('oml.item.api')
@@ -175,6 +169,7 @@ def findMetadata(data):
     return response
 actions.register(findMetadata)
 
+
 def getMetadata(data):
     '''
         takes {
@@ -198,6 +193,7 @@ def getMetadata(data):
     return response
 actions.register(getMetadata)
 
+
 def resetMetadata(data):
     item = models.Item.get(data['id'])
     if item and 'primaryid' in item.meta:
@@ -207,6 +203,7 @@ def resetMetadata(data):
     return {}
 actions.register(resetMetadata)
 
+
 def download(data):
     '''
         takes {

oml/item/handlers.py

@@ -2,15 +2,16 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, with_statement
 
+from datetime import datetime
+import mimetypes
 import os
 import zipfile
-import mimetypes
-from datetime import datetime
 
-import tornado.web
 from models import Item
-import settings
 import db
+import settings
+import tornado.web
+
 
 class OMLHandler(tornado.web.RequestHandler):
 

oml/item/icons.py

@@ -2,26 +2,24 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division, with_statement
 
-import sqlite3
 from StringIO import StringIO
 import Image
+import sqlite3
 
+import tornado.concurrent
+import tornado.gen
 import tornado.ioloop
 import tornado.web
-import tornado.gen
-import tornado.concurrent
 
 from oxtornado import run_async
-
-from utils import resize_image
-
-
 from settings import icons_db_path
+from utils import resize_image
 import db
 
 import logging
 logger = logging.getLogger('oml.item.icons')
 
+
 class Icons(dict):
     def __init__(self, db):
         self._db = db

oml/item/models.py

@@ -2,43 +2,35 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 
-import os
-import re
-import base64
-import json
-import hashlib
 from datetime import datetime
 from StringIO import StringIO
+import base64
+import hashlib
+import json
+import os
+import re
 import shutil
-import logging
 import unicodedata
 
 import Image
 import ox
-
-import db
-from db import MutableDict
 import sqlalchemy as sa
 
-import settings
-from settings import config
-
+from changelog import Changelog
+from db import MutableDict
+from icons import icons
 from person import get_sort_name
-
+from settings import config
+from utils import remove_empty_folders
+from websocket import trigger_event
+import db
 import media
-
-#import meta
 import metaremote as meta
-
+import settings
 import state
 import utils
 
-
-from icons import icons
-from changelog import Changelog
-from websocket import trigger_event
-from utils import remove_empty_folders
-
+import logging
 logger = logging.getLogger('oml.item.model')
 
 user_items = sa.Table('useritem', db.metadata,

oml/item/person.py

@@ -5,9 +5,10 @@ from __future__ import division
 import unicodedata
 
 import ox
+import sqlalchemy as sa
 
 import db
-import sqlalchemy as sa
+
 
 def get_sort_name(name, sortname=None):
     name = unicodedata.normalize('NFKD', name).strip()

oml/item/query.py

@@ -2,13 +2,13 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 
-import settings
-import models
-import utils
+#does not work in sqlite
+#from sqlalchemy.sql.expression import nullslast
+
 from queryparser import Parser
-
-
-from sqlalchemy.sql.expression import nullslast
+import models
+import settings
+import utils
 
 def parse(data):
     query = {}

oml/item/scan.py

@@ -2,24 +2,22 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 
+from datetime import datetime
 import os
 import shutil
-from datetime import datetime
 import time
 
 import ox
 
-import settings
-import db
-from item.models import File
-from user.models import User, List
-
 from changelog import Changelog
-
-import media
-from websocket import trigger_event
-import state
+from item.models import File
+from user.models import List
 from utils import remove_empty_folders
+from websocket import trigger_event
+import db
+import media
+import settings
+import state
 
 import logging
 logger = logging.getLogger('oml.item.scan')