Style: Re-group and reorder imports

diff --git a/m_librarian/db.py b/m_librarian/db.py
index d91068844148755f9964e59407f8468770cfc6ba..064ca9a0d8a75cd89667feaddfecc9be450ff358 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -2,9 +2,11 @@
 
 from __future__ import print_function
 import os
+
 from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \
     ForeignKey, DateCol, DatabaseIndex, RelatedJoin, \
     connectionForURI, sqlhub, SQLObjectNotFound, dberrors
+
 from .compat import string_type
 from .config import get_config
 

diff --git a/m_librarian/glst.py b/m_librarian/glst.py
index fedb27b2ed6647fe38b2d8569f7a0483fcad355e..206dcc40f858a306524ef07e1d2ec68b02269cc7 100755 (executable)
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -1,9 +1,10 @@
 #! /usr/bin/env python
 
 from __future__ import print_function
-import codecs
 from glob import glob
+import codecs
 import os
+
 from sqlobject import sqlhub, SQLObjectNotFound
 from .db import Genre
 

diff --git a/m_librarian/inp.py b/m_librarian/inp.py
index 3789dd2e2d986c5969a7688d9651b8cfd2219095..f910b10eefe03e6deb6b66c4e54d9015a33646bc 100644 (file)
--- a/m_librarian/inp.py
+++ b/m_librarian/inp.py
@@ -1,8 +1,10 @@
 
 import os
 from zipfile import ZipFile
+
 from sqlobject import sqlhub
 from sqlobject.sqlbuilder import Select
+
 from .db import Author, Book, Extension, Genre, Language, \
     insert_name, insert_author
 

diff --git a/m_librarian/web/app.py b/m_librarian/web/app.py
index a5ea5b2f52004364ef0c23396af9ee4571ed6a35..38e5beacf2d0c9c72a5492fff7addaef5b881ea6 100644 (file)
--- a/m_librarian/web/app.py
+++ b/m_librarian/web/app.py
@@ -2,8 +2,8 @@
 
 import os
 
-from sqlobject.sqlbuilder import CONCAT
 from bottle import cheetah_view, redirect, request, route, static_file
+from sqlobject.sqlbuilder import CONCAT
 
 from ..config import get_config
 from ..db import Author, Book

diff --git a/scripts/ml-initdb.py b/scripts/ml-initdb.py
index c229c5ea63bba64d1b006f56014f9a0a2b244c6a..4c21b1aaf0b3b0bb83816c754cd18fac54ed5c57 100755 (executable)
--- a/scripts/ml-initdb.py
+++ b/scripts/ml-initdb.py
@@ -1,6 +1,7 @@
 #! /usr/bin/env python
 
 import argparse
+
 from m_librarian.config import get_config
 from m_librarian.db import open_db, init_db
 from m_librarian.glst import import_glst

diff --git a/scripts/ml-search.py b/scripts/ml-search.py
index 28daa0b288226ab9f1d34fe4252f0f82104f1805..7e6c9da3b793c02df82ea5d8570635258427a31a 100755 (executable)
--- a/scripts/ml-search.py
+++ b/scripts/ml-search.py
@@ -4,6 +4,7 @@ from __future__ import print_function
 import argparse
 import os
 import sys
+
 from sqlobject.sqlbuilder import CONCAT
 
 from m_lib.defenc import default_encoding

diff --git a/scripts/ml-web.py b/scripts/ml-web.py
index 773be00e1cbefd9f007b090c7582087c0a286861..c93b5fd88c2243a4d923d2a795065592e605b417 100755 (executable)
--- a/scripts/ml-web.py
+++ b/scripts/ml-web.py
@@ -7,9 +7,9 @@ import webbrowser
 from bottle import thread  # portable import
 
 from m_librarian.db import open_db
-import m_librarian.web.app  # noqa: F401 imported but unused
 from m_librarian.web.server import run_server
 from m_librarian.web.utils import get_lock, close_lock, get_open_port
+import m_librarian.web.app  # noqa: F401 imported but unused
 
 
 def start_browser(port):

diff --git a/tests/dbutils.py b/tests/dbutils.py
index bb5a362a18e0b576065b76bfd80c3a247945b64e..06a9e9c6ab6afc0f3b4df51f85f67741a400e3bf 100644 (file)
--- a/tests/dbutils.py
+++ b/tests/dbutils.py
@@ -1,6 +1,8 @@
 
 import os
+
 from sqlobject.tests.dbtest import getConnection
+
 from m_librarian.db import open_db, init_db
 from m_librarian.inp import import_inpx