Fix some imports

Author: jschaeff

docs/conf.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #
-# python_hll documentation build configuration file, created by
+# python_hll2 documentation build configuration file, created by
 # sphinx-quickstart on Fri Jun  9 13:47:02 2017.
 #
 # This file is execfile()d with the current directory set to its
@@ -20,9 +19,11 @@
 #
 import os
 import sys
-sys.path.insert(0, os.path.abspath('..'))
+from pathlib import Path
 
-import python_hll
+sys.path.insert(0, Path.resolve(".."))
+
+import python_hll2
 
 # -- General configuration ---------------------------------------------
 
@@ -32,33 +33,33 @@
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
+extensions = ["sphinx.ext.autodoc", "sphinx.ext.viewcode"]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'python-hll'
-copyright = u"2019, Jon Aquino"
-author = u"Jon Aquino"
+project = "python-hll2"
+copyright = "2019, Jon Aquino"
+author = "Jon Aquino"
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
 # the built documents.
 #
 # The short X.Y version.
-version = python_hll.__version__
+version = python_hll2.__version__
 # The full version, including alpha/beta/rc tags.
-release = python_hll.__version__
+release = python_hll2.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -70,10 +71,10 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -84,7 +85,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'alabaster'
+html_theme = "alabaster"
 
 # Theme options are theme-specific and customize the look and feel of a
 # theme further.  For a list of options available for each theme, see the
@@ -95,13 +96,13 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 
 # -- Options for HTMLHelp output ---------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'python_hlldoc'
+htmlhelp_basename = "python_hlldoc"
 
 
 # -- Options for LaTeX output ------------------------------------------
@@ -128,9 +129,9 @@
 # (source start file, target name, title, author, documentclass
 # [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'python_hll.tex',
-     u'python-hll Documentation',
-     u'Jon Aquino', 'manual'),
+    (master_doc, "python_hll2.tex",
+     "python-hll Documentation",
+     "Jon Aquino", "manual"),
 ]
 
 
@@ -139,8 +140,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'python_hll',
-     u'python-hll Documentation',
+    (master_doc, "python_hll2",
+     "python-hll Documentation",
      [author], 1)
 ]
 
@@ -151,27 +152,27 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'python_hll',
-     u'python-hll Documentation',
+    (master_doc, "python_hll2",
+     "python-hll Documentation",
      author,
-     'python_hll',
-     'One line description of project.',
-     'Miscellaneous'),
+     "python_hll2",
+     "One line description of project.",
+     "Miscellaneous"),
 ]
 
 # -- Make ReadTheDocs generate API doc ----------------------------------------
 
 # See https://github.com/isogeo/isogeo-api-py-minsdk/commit/df45262dae266035946839009e02e6c5e068a05f
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 if on_rtd:
     def run_apidoc(_):
         from sphinx.apidoc import main as apidoc_main
 
         cur_dir = os.path.abspath(os.path.dirname(__file__))
-        output_path = os.path.join(cur_dir, 'docs')
-        modules = os.path.join(cur_dir, os.path.normpath(r"../python_hll"))
+        output_path = os.path.join(cur_dir, "docs")
+        modules = os.path.join(cur_dir, os.path.normpath(r"../python_hll2"))
         exclusions = []
-        apidoc_main([None, '-e', '-f', '-o', output_path, modules] + exclusions)
+        apidoc_main([None, "-e", "-f", "-o", output_path, modules] + exclusions)
 
     def setup(app):
-        app.connect('builder-inited', run_apidoc)
+        app.connect("builder-inited", run_apidoc)

src/python_hll2/hll.py

@@ -121,7 +121,7 @@ def __init__(self, log2m, regwidth, expthresh=-1, sparseon=True, type=HLLType.EM
                start at. This cannot be ``None``.
         :type type: HLLType
         """
-        from python_hll.hllutil import HLLUtil
+        from python_hll2.hllutil import HLLUtil
 
         self._log2m = log2m
         if log2m < HLL.MINIMUM_LOG2M_PARAM or log2m > HLL.MAXIMUM_EXPLICIT_THRESHOLD:
@@ -409,7 +409,7 @@ def _sparse_probabilistic_algorithm_cardinality(self):
         :returns: the exact, unrounded cardinality given by the HLL algorithm
         :rtype: float
         """
-        from python_hll.hllutil import HLLUtil
+        from python_hll2.hllutil import HLLUtil
         m = self._m
 
         # compute the "indicator function" -- sum(2^(-M[j])) where M[j] is the
@@ -439,7 +439,7 @@ def _full_probabilistic_algorithm_cardinality(self):
 
         :rtype: float
         """
-        from python_hll.hllutil import HLLUtil
+        from python_hll2.hllutil import HLLUtil
         # for performance
         m = self._m
         # compute the "indicator function" -- sum(2^(-M[j])) where M[j] is the
@@ -692,7 +692,7 @@ def to_bytes(self, schema_version=SerializationUtil.DEFAULT_SCHEMA_VERSION):
                   ``None`` or empty.
         :rtype: list
         """
-        from python_hll.hllutil import HLLUtil
+        from python_hll2.hllutil import HLLUtil
         if self._type == HLLType.EMPTY:
             byte_array_length = schema_version.padding_bytes(self._type)
             byte_array = [0] * byte_array_length
@@ -768,7 +768,7 @@ def from_bytes(cls, bytes):
         :returns: the deserialized HLL. This will never be ``None``.
         :rtype: HLL
         """
-        from python_hll.hllutil import HLLUtil
+        from python_hll2.hllutil import HLLUtil
         schema_version = SerializationUtil.get_schema_version(bytes)
         metadata = schema_version.read_metadata(bytes)