diff options
-rw-r--r-- | lesana/collection.py | 6 | ||||
-rw-r--r-- | lesana/types.py | 1 | ||||
-rwxr-xr-x | scripts/lesana | 1 | ||||
-rwxr-xr-x | scripts/openlibrary2lesana | 3 | ||||
-rwxr-xr-x | scripts/tellico2lesana | 3 | ||||
-rw-r--r-- | setup.py | 2 | ||||
-rw-r--r-- | tests/test_collection.py | 1 | ||||
-rw-r--r-- | tests/test_commands.py | 1 | ||||
-rw-r--r-- | tests/test_derivatives.py | 1 |
9 files changed, 10 insertions, 9 deletions
diff --git a/lesana/collection.py b/lesana/collection.py index aa82a39..a3c6e22 100644 --- a/lesana/collection.py +++ b/lesana/collection.py @@ -5,12 +5,12 @@ import os import shutil import uuid +import jinja2 import ruamel.yaml import xapian -import jinja2 +from pkg_resources import resource_filename, resource_string -from pkg_resources import resource_string, resource_filename -from . import types, templating +from . import templating, types logger = logging.getLogger(__name__) diff --git a/lesana/types.py b/lesana/types.py index 87c933a..cce8987 100644 --- a/lesana/types.py +++ b/lesana/types.py @@ -9,7 +9,6 @@ import decimal import logging import dateutil.parser - import xapian logger = logging.getLogger(__name__) diff --git a/scripts/lesana b/scripts/lesana index 96a973f..ed6084a 100755 --- a/scripts/lesana +++ b/scripts/lesana @@ -3,6 +3,7 @@ Lesana Command Line interface """ import logging + import lesana.command diff --git a/scripts/openlibrary2lesana b/scripts/openlibrary2lesana index 247a8e0..8394a3d 100755 --- a/scripts/openlibrary2lesana +++ b/scripts/openlibrary2lesana @@ -5,13 +5,12 @@ import logging import os import sys -import requests import dateutil.parser +import requests import lesana import lesana.command - OPENAPI_BASE = "https://openlibrary.org" OPENAPI_ISBN_URL = OPENAPI_BASE + '/isbn/{isbn}.json' diff --git a/scripts/tellico2lesana b/scripts/tellico2lesana index 3f56213..f432946 100755 --- a/scripts/tellico2lesana +++ b/scripts/tellico2lesana @@ -2,12 +2,11 @@ import argparse import datetime -from xml.etree import ElementTree import zipfile +from xml.etree import ElementTree import lesana - NS = {'tellico': 'http://periapsis.org/tellico/'} # https://docs.kde.org/trunk5/en/extragear-office/tellico/field-type-values.html @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup try: with open("README.rst", 'r') as fp: diff --git a/tests/test_collection.py b/tests/test_collection.py index 99a5517..51b7864 100644 --- a/tests/test_collection.py +++ b/tests/test_collection.py @@ -10,6 +10,7 @@ import git import ruamel.yaml import lesana + from . import utils diff --git a/tests/test_commands.py b/tests/test_commands.py index 2f3fa8c..83f5c5e 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -5,6 +5,7 @@ import tempfile import unittest from lesana import command + from . import utils diff --git a/tests/test_derivatives.py b/tests/test_derivatives.py index 0218f3d..ec3ae65 100644 --- a/tests/test_derivatives.py +++ b/tests/test_derivatives.py @@ -4,6 +4,7 @@ import unittest import lesana from lesana import types + from . import utils |