Style: Re-group and reorder imports

[m_librarian.git] / m_librarian / inp.py

diff --git a/m_librarian/inp.py b/m_librarian/inp.py
index f46bea62fe2a5270cb2075ec36fdb4ecd2f55df3..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
 
@@ -72,13 +74,20 @@ def import_inp_line(archive, parts):
             book.addGenre(genre_row)
 
 
+def tounicode(s):
+    if isinstance(s, bytes):
+        return s.decode('utf-8')
+    else:
+        return s
+
+
 def import_inp(archive, inp):
     archives = set()
     files = set()
     connection = sqlhub.processConnection
     for file, in connection.queryAll(connection.sqlrepr(
             Select(Book.q.file, Book.q.archive == archive))):
-        files.add((archive, file.decode('utf-8')))
+        files.add((archive, tounicode(file)))
     for line in inp:
         line = line.decode('utf-8')
         _archive, parts = split_line(line)
@@ -86,7 +95,7 @@ def import_inp(archive, inp):
             archives.add(_archive)
             for file, in connection.queryAll(connection.sqlrepr(
                     Select(Book.q.file, Book.q.archive == _archive))):
-                files.add((_archive, file.decode('utf-8')))
+                files.add((_archive, tounicode(file)))
         file = parts[5]
         if (_archive or archive, file) not in files:
             files.add((_archive or archive, file))