X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Finp.py;h=f910b10eefe03e6deb6b66c4e54d9015a33646bc;hb=f3860aa18c077dbffc5fcc876f0f2aba49509305;hp=d0b567af4c5f97f218b4c393e575b6d69a18ab17;hpb=1f66e2a621c7aab33b425640bd8ba76579c2fbaf;p=m_librarian.git diff --git a/m_librarian/inp.py b/m_librarian/inp.py index d0b567a..f910b10 100644 --- a/m_librarian/inp.py +++ b/m_librarian/inp.py @@ -1,9 +1,10 @@ import os -import sys 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 @@ -73,11 +74,10 @@ def import_inp_line(archive, parts): book.addGenre(genre_row) -if sys.version[0] == 2: - def tounicode(s): +def tounicode(s): + if isinstance(s, bytes): return s.decode('utf-8') -else: - def tounicode(s): + else: return s