From 754ccaedd6d9c2e348116b041f6d9226f4ecd805 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 08:56:25 -0700
Subject: [PATCH] Move importers into module

---
 bookwyrm/importers/__init__.py                            | 5 +++++
 bookwyrm/{ => importers}/goodreads_import.py              | 2 +-
 bookwyrm/{ => importers}/importer.py                      | 0
 bookwyrm/{ => importers}/librarything_import.py           | 2 +-
 bookwyrm/tests/importers/__init__.py                      | 1 +
 bookwyrm/tests/{ => importers}/test_goodreads_import.py   | 4 ++--
 .../tests/{ => importers}/test_librarything_import.py     | 4 ++--
 bookwyrm/views/import_data.py                             | 8 ++++----
 8 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 bookwyrm/importers/__init__.py
 rename bookwyrm/{ => importers}/goodreads_import.py (93%)
 rename bookwyrm/{ => importers}/importer.py (100%)
 rename bookwyrm/{ => importers}/librarything_import.py (97%)
 create mode 100644 bookwyrm/tests/importers/__init__.py
 rename bookwyrm/tests/{ => importers}/test_goodreads_import.py (99%)
 rename bookwyrm/tests/{ => importers}/test_librarything_import.py (99%)

diff --git a/bookwyrm/importers/__init__.py b/bookwyrm/importers/__init__.py
new file mode 100644
index 000000000..f13672e06
--- /dev/null
+++ b/bookwyrm/importers/__init__.py
@@ -0,0 +1,5 @@
+""" import classes """
+
+from .importer import Importer
+from .goodreads_import import GoodreadsImporter
+from .librarything_import import LibrarythingImporter
diff --git a/bookwyrm/goodreads_import.py b/bookwyrm/importers/goodreads_import.py
similarity index 93%
rename from bookwyrm/goodreads_import.py
rename to bookwyrm/importers/goodreads_import.py
index b439993a8..0b126c14c 100644
--- a/bookwyrm/goodreads_import.py
+++ b/bookwyrm/importers/goodreads_import.py
@@ -1,5 +1,5 @@
 """ handle reading a csv from goodreads """
-from bookwyrm.importer import Importer
+from . import Importer
 
 
 class GoodreadsImporter(Importer):
diff --git a/bookwyrm/importer.py b/bookwyrm/importers/importer.py
similarity index 100%
rename from bookwyrm/importer.py
rename to bookwyrm/importers/importer.py
diff --git a/bookwyrm/librarything_import.py b/bookwyrm/importers/librarything_import.py
similarity index 97%
rename from bookwyrm/librarything_import.py
rename to bookwyrm/importers/librarything_import.py
index 6389eeed4..3755cb1ad 100644
--- a/bookwyrm/librarything_import.py
+++ b/bookwyrm/importers/librarything_import.py
@@ -2,7 +2,7 @@
 import re
 import math
 
-from bookwyrm.importer import Importer
+from . import Importer
 
 
 class LibrarythingImporter(Importer):
diff --git a/bookwyrm/tests/importers/__init__.py b/bookwyrm/tests/importers/__init__.py
new file mode 100644
index 000000000..b6e690fd5
--- /dev/null
+++ b/bookwyrm/tests/importers/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/bookwyrm/tests/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
similarity index 99%
rename from bookwyrm/tests/test_goodreads_import.py
rename to bookwyrm/tests/importers/test_goodreads_import.py
index c06b49fc3..83773e3cb 100644
--- a/bookwyrm/tests/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -7,8 +7,8 @@ from unittest.mock import patch
 from django.test import TestCase
 import responses
 
-from bookwyrm import models, importer
-from bookwyrm.goodreads_import import GoodreadsImporter
+from bookwyrm import models
+from bookwyrm.importers import importer, GoodreadsImporter
 from bookwyrm.settings import DOMAIN
 
 
diff --git a/bookwyrm/tests/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
similarity index 99%
rename from bookwyrm/tests/test_librarything_import.py
rename to bookwyrm/tests/importers/test_librarything_import.py
index 54b8b4226..8baa305f6 100644
--- a/bookwyrm/tests/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -6,8 +6,8 @@ from unittest.mock import patch
 from django.test import TestCase
 import responses
 
-from bookwyrm import models, importer
-from bookwyrm.librarything_import import LibrarythingImporter
+from bookwyrm import models
+from bookwyrm.importers import importer, LibrarythingImporter
 from bookwyrm.settings import DOMAIN
 
 
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index dadc91d6d..5bdbe9151 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -9,8 +9,8 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import forms, goodreads_import, librarything_import, models
-from bookwyrm.importer import Importer
+from bookwyrm import forms, models
+from bookwyrm.importers import Importer, LibrarythingImporter, GoodreadsImporter
 from bookwyrm.tasks import app
 
 # pylint: disable= no-self-use
@@ -41,10 +41,10 @@ class Import(View):
 
             importer = None
             if source == "LibraryThing":
-                importer = librarything_import.LibrarythingImporter()
+                importer = LibrarythingImporter()
             else:
                 # Default : GoodReads
-                importer = goodreads_import.GoodreadsImporter()
+                importer = GoodreadsImporter()
 
             try:
                 job = importer.create_job(