Add Python3 compatibility (#4)

Author: StephenKrewson

.gitignore

@@ -1,4 +1,105 @@
-/Untitled.ipynb
-/.ipynb_checkpoints/
-/hathitrust_api/__pycache__/*
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
 

__init__.py

@@ -1,3 +1,3 @@
 
 
-from hathitrust_api import BibAPI, DataAPI, SolrAPI
+from .hathitrust_api import BibAPI, DataAPI, SolrAPI

hathitrust_api/__init__.py

@@ -1,5 +1,5 @@
 
 
-from bib_api import BibAPI 
-from data_api import DataAPI
-from solr_api import SolrAPI
+from .bib_api import BibAPI 
+from .data_api import DataAPI
+from .solr_api import SolrAPI

hathitrust_api/bib_api.py

@@ -1,7 +1,9 @@
+from __future__ import absolute_import
+
 
 import requests
 
-from constants import BIB_BASEURL
+from .constants import BIB_BASEURL
 
 
 class BibAPI(object):

hathitrust_api/constants.py

@@ -1,5 +1,4 @@
 
-
 # constants for bibliographic api
 BIB_BASEURL = 'http://catalog.hathitrust.org/api/volumes/'
 

hathitrust_api/data_api.py

@@ -1,8 +1,9 @@
+from __future__ import absolute_import
 
 import requests
 from requests_oauthlib import OAuth1
 
-from constants import DATA_BASEURL, SECURE_DATA_BASEURL
+from .constants import DATA_BASEURL, SECURE_DATA_BASEURL
 
 
 class DataAPI(object):

hathitrust_api/solr_api.py

@@ -1,12 +1,14 @@
+from __future__ import absolute_import
+from __future__ import print_function
+
 
 import sys
 import json
 import zipfile
-from string import replace
 
 import requests
 
-from constants import QUERY_BASEURL, MARC_BASEURL
+from .constants import QUERY_BASEURL, MARC_BASEURL
 
 
 class SolrAPI(object):
@@ -133,10 +135,10 @@ def _cleanquery(querystring):
     it will regard terms surrounded with '...' as separate
     queryterms, but "..." as a single concatenated phrase.
     """
-    return replace(querystring, '\'', '\"')
+    return querystring.replace('\'', '\"')
 
 
 if __name__ == "__main__":
     #ids = [ 'mdp.39015026997125', 'uc1.31822021576848', 'uc2.ark:/13960/t3902080r']
 
-    print _cleanquery("author : 'new zealand'")
+    print(_cleanquery("author : 'new zealand'"))

setup.py

@@ -6,5 +6,6 @@
       url='github.com/rlmv/hathitrust-api',
       description='Python wrappers for the HathiTrust APIs',
       author='Robert Marchman', 
-      packages=['hathitrust_api']
-      )
+      packages=['hathitrust_api'],
+      install_requires=['requests', 'requests-oauthlib']
+      )