summaryrefslogtreecommitdiffstats
path: root/python/fatcat_tools
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2018-11-12 23:37:28 -0800
committerBryan Newbold <bnewbold@robocracy.org>2018-11-12 23:37:28 -0800
commit7ebda2e051b51e49544ab75673b19ec5f27d9d45 (patch)
tree671fd995b2fdb0b9ec69cfcb0e7771f43c13d32d /python/fatcat_tools
parent889606ffac5096610e6123134cb89423c15ef464 (diff)
downloadfatcat-7ebda2e051b51e49544ab75673b19ec5f27d9d45.tar.gz
fatcat-7ebda2e051b51e49544ab75673b19ec5f27d9d45.zip
more python module refactoring
Diffstat (limited to 'python/fatcat_tools')
-rw-r--r--python/fatcat_tools/changelog_workers.py2
-rw-r--r--python/fatcat_tools/crossref_importer.py2
-rw-r--r--python/fatcat_tools/elastic_workers.py4
-rwxr-xr-xpython/fatcat_tools/grobid_metadata_importer.py2
-rw-r--r--python/fatcat_tools/issn_importer.py2
-rw-r--r--python/fatcat_tools/matched_importer.py2
-rw-r--r--python/fatcat_tools/orcid_importer.py2
-rw-r--r--python/fatcat_tools/transforms.py (renamed from python/fatcat_tools/entity_helpers.py)0
8 files changed, 8 insertions, 8 deletions
diff --git a/python/fatcat_tools/changelog_workers.py b/python/fatcat_tools/changelog_workers.py
index e341ea32..223d4478 100644
--- a/python/fatcat_tools/changelog_workers.py
+++ b/python/fatcat_tools/changelog_workers.py
@@ -2,7 +2,7 @@
import json
import time
from itertools import islice
-from fatcat.worker_common import FatcatWorker
+from fatcat_tools.worker_common import FatcatWorker
from pykafka.common import OffsetType
diff --git a/python/fatcat_tools/crossref_importer.py b/python/fatcat_tools/crossref_importer.py
index 37005965..6a5ad824 100644
--- a/python/fatcat_tools/crossref_importer.py
+++ b/python/fatcat_tools/crossref_importer.py
@@ -5,7 +5,7 @@ import sqlite3
import datetime
import itertools
import fatcat_client
-from fatcat.importer_common import FatcatImporter
+from fatcat_tools.importer_common import FatcatImporter
class FatcatCrossrefImporter(FatcatImporter):
diff --git a/python/fatcat_tools/elastic_workers.py b/python/fatcat_tools/elastic_workers.py
index 3d2e9c39..eac8d6b0 100644
--- a/python/fatcat_tools/elastic_workers.py
+++ b/python/fatcat_tools/elastic_workers.py
@@ -2,9 +2,9 @@
import json
import time
import requests
-from fatcat.worker_common import FatcatWorker
+from fatcat_tools.worker_common import FatcatWorker
from fatcat_client.models import ReleaseEntity
-from fatcat.entity_helpers import *
+from fatcat_tools.transforms import *
from pykafka.common import OffsetType
diff --git a/python/fatcat_tools/grobid_metadata_importer.py b/python/fatcat_tools/grobid_metadata_importer.py
index 95cc285e..effa0d94 100755
--- a/python/fatcat_tools/grobid_metadata_importer.py
+++ b/python/fatcat_tools/grobid_metadata_importer.py
@@ -5,7 +5,7 @@ import json
import base64
import datetime
import fatcat_client
-from fatcat.importer_common import FatcatImporter
+from fatcat_tools.importer_common import FatcatImporter
MAX_ABSTRACT_BYTES=4096
diff --git a/python/fatcat_tools/issn_importer.py b/python/fatcat_tools/issn_importer.py
index c9ef50b5..e3ed7382 100644
--- a/python/fatcat_tools/issn_importer.py
+++ b/python/fatcat_tools/issn_importer.py
@@ -3,7 +3,7 @@ import sys
import json
import itertools
import fatcat_client
-from fatcat.importer_common import FatcatImporter
+from fatcat_tools.importer_common import FatcatImporter
# CSV format (generated from git.archive.org/webgroup/oa-journal-analysis):
# ISSN-L,in_doaj,in_road,in_norwegian,in_crossref,title,publisher,url,lang,ISSN-print,ISSN-electronic,doi_count,has_doi,is_oa,is_kept,publisher_size,url_live,url_live_status,url_live_final_status,url_live_final_url,url_live_status_simple,url_live_final_status_simple,url_domain,gwb_pdf_count
diff --git a/python/fatcat_tools/matched_importer.py b/python/fatcat_tools/matched_importer.py
index 7f55369b..627ab6f1 100644
--- a/python/fatcat_tools/matched_importer.py
+++ b/python/fatcat_tools/matched_importer.py
@@ -4,7 +4,7 @@ import json
import sqlite3
import itertools
import fatcat_client
-from fatcat.importer_common import FatcatImporter
+from fatcat_tools.importer_common import FatcatImporter
#row = row.split('\t')
#assert len(row) == 2
diff --git a/python/fatcat_tools/orcid_importer.py b/python/fatcat_tools/orcid_importer.py
index e1f5943c..f2366c66 100644
--- a/python/fatcat_tools/orcid_importer.py
+++ b/python/fatcat_tools/orcid_importer.py
@@ -3,7 +3,7 @@ import sys
import json
import itertools
import fatcat_client
-from fatcat.importer_common import FatcatImporter
+from fatcat_tools.importer_common import FatcatImporter
def value_or_none(e):
if type(e) == dict:
diff --git a/python/fatcat_tools/entity_helpers.py b/python/fatcat_tools/transforms.py
index c454536b..c454536b 100644
--- a/python/fatcat_tools/entity_helpers.py
+++ b/python/fatcat_tools/transforms.py