CLN: move remaning extensions to _libs

Author: jreback

asv_bench/benchmarks/algorithms.py

@@ -5,7 +5,7 @@
 import pandas as pd
 from pandas.util import testing as tm
 
-for imp in ['pandas.util.hashing', 'pandas.tools.hashing']:
+for imp in ['pandas.util', 'pandas.tools.hashing']:
     try:
         hashing = import_module(imp)
         break

doc/source/whatsnew/v0.20.0.txt

@@ -1230,19 +1230,19 @@ If indicated, a deprecation warning will be issued if you reference theses modul
     "pandas.algos", "pandas._libs.algos", ""
     "pandas.hashtable", "pandas._libs.hashtable", ""
     "pandas.indexes", "pandas.core.indexes", ""
-    "pandas.json", "pandas.io.json.libjson", "X"
-    "pandas.parser", "pandas.io.libparsers", "X"
+    "pandas.json", "pandas._libs.json", "X"
+    "pandas.parser", "pandas._libs.parsers", "X"
     "pandas.formats", "pandas.io.formats", ""
     "pandas.sparse", "pandas.core.sparse", ""
     "pandas.tools", "pandas.core.reshape", ""
     "pandas.types", "pandas.core.dtypes", ""
-    "pandas.io.sas.saslib", "pandas.io.sas.libsas", ""
+    "pandas.io.sas.saslib", "pandas.io.sas._sas", ""
     "pandas._join", "pandas._libs.join", ""
     "pandas._hash", "pandas._libs.hashing", ""
     "pandas._period", "pandas._libs.period", ""
-    "pandas._sparse", "pandas.core.sparse.libsparse", ""
-    "pandas._testing", "pandas.util._testing", ""
-    "pandas._window", "pandas.core.libwindow", ""
+    "pandas._sparse", "pandas._libs.sparse", ""
+    "pandas._testing", "pandas._libs.testing", ""
+    "pandas._window", "pandas._libs.window", ""
 
 
 Some new subpackages are created with public functionality that is not directly

pandas/io/parsers.pyx renamed to pandas/_libs/parsers.pyx

@@ -90,14 +90,14 @@ static struct PyModuleDef moduledef = {
     NULL          /* m_free */
 };
 
-#define PYMODINITFUNC PyMODINIT_FUNC PyInit_libjson(void)
+#define PYMODINITFUNC PyMODINIT_FUNC PyInit_json(void)
 #define PYMODULE_CREATE() PyModule_Create(&moduledef)
 #define MODINITERROR return NULL
 
 #else
 
-#define PYMODINITFUNC PyMODINIT_FUNC initlibjson(void)
-#define PYMODULE_CREATE() Py_InitModule("libjson", ujsonMethods)
+#define PYMODINITFUNC PyMODINIT_FUNC initjson(void)
+#define PYMODULE_CREATE() Py_InitModule("json", ujsonMethods)
 #define MODINITERROR return
 
 #endif

pandas/core/sparse/sparse.pyx renamed to pandas/_libs/sparse.pyx

@@ -71,7 +71,7 @@ def load_reduce(self):
 
     # 12588, extensions moving
     ('pandas._sparse', 'BlockIndex'):
-        ('pandas.core.sparse.libsparse', 'BlockIndex'),
+        ('pandas._libs.sparse', 'BlockIndex'),
     ('pandas.tslib', 'Timestamp'):
         ('pandas._libs.tslib', 'Timestamp'),
     ('pandas.tslib', '__nat_unpickle'):

pandas/core/sparse/sparse_op_helper.pxi.in renamed to pandas/_libs/sparse_op_helper.pxi.in

@@ -20,7 +20,7 @@
 
 from pandas.core.sparse.api import SparseDataFrame, SparseSeries
 from pandas.core.sparse.array import SparseArray
-from pandas.core.sparse.libsparse import IntIndex
+from pandas._libs.sparse import IntIndex
 
 from pandas.core.categorical import Categorical, _factorize_from_iterable
 from pandas.core.sorting import (get_group_index, get_compressed_ids,

pandas/_libs/src/ujson/python/ujson.c

@@ -29,8 +29,8 @@
     astype_nansafe, find_common_type)
 from pandas.core.dtypes.missing import isnull, notnull, na_value_for_dtype
 
-from pandas.core.sparse import libsparse as splib
-from pandas.core.sparse.libsparse import SparseIndex, BlockIndex, IntIndex
+import pandas._libs.sparse as splib
+from pandas._libs.sparse import SparseIndex, BlockIndex, IntIndex
 from pandas._libs import index as libindex
 import pandas.core.algorithms as algos
 import pandas.core.ops as ops

pandas/core/window.pyx renamed to pandas/_libs/window.pyx

@@ -25,7 +25,7 @@
                                    create_block_manager_from_arrays)
 import pandas.core.generic as generic
 from pandas.core.sparse.series import SparseSeries, SparseArray
-from pandas.core.sparse.libsparse import BlockIndex, get_blocks
+from pandas._libs.sparse import BlockIndex, get_blocks
 from pandas.util._decorators import Appender
 import pandas.core.ops as ops
 

pandas/compat/pickle_compat.py

@@ -6,7 +6,7 @@
 from pandas.core.dtypes.common import is_scalar
 from pandas.core.sparse.array import SparseArray
 from pandas.util._validators import validate_bool_kwarg
-from pandas.core.sparse import libsparse as splib
+import pandas._libs.sparse as splib
 
 
 class SparseList(PandasObject):

pandas/core/reshape/reshape.py

@@ -26,8 +26,8 @@
 from pandas.core.sparse.array import (
     make_sparse, _sparse_array_op, SparseArray,
     _make_index)
-from pandas.core.sparse.libsparse import BlockIndex, IntIndex
-import pandas.core.sparse.libsparse as splib
+from pandas._libs.sparse import BlockIndex, IntIndex
+import pandas._libs.sparse as splib
 
 from pandas.core.sparse.scipy_sparse import (
     _sparse_series_to_coo,

pandas/core/sparse/array.py

@@ -33,7 +33,7 @@
 from pandas.core.base import (PandasObject, SelectionMixin,
                               GroupByMixin)
 import pandas.core.common as com
-import pandas.core.libwindow as _window
+import pandas._libs.window as _window
 from pandas.tseries.offsets import DateOffset
 from pandas import compat
 from pandas.compat.numpy import function as nv

pandas/core/sparse/frame.py

@@ -20,7 +20,7 @@
 from pandas.io.common import (_is_url, _urlopen, _validate_header_arg,
                               get_filepath_or_buffer, _NA_VALUES)
 from pandas.core.indexes.period import Period
-from pandas.io.json import libjson
+import pandas._libs.json as json
 from pandas.compat import (map, zip, reduce, range, lrange, u, add_metaclass,
                            string_types, OrderedDict)
 from pandas.core import config
@@ -1447,7 +1447,7 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
             elif isinstance(cell.val, date):
                 num_format_str = self.date_format
 
-            stylekey = libjson.dumps(cell.style)
+            stylekey = json.dumps(cell.style)
             if num_format_str:
                 stylekey += num_format_str
 
@@ -1575,7 +1575,7 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
             elif isinstance(cell.val, date):
                 num_format_str = self.date_format
 
-            stylekey = libjson.dumps(cell.style)
+            stylekey = json.dumps(cell.style)
             if num_format_str:
                 stylekey += num_format_str
 

pandas/core/sparse/list.py

@@ -2,7 +2,7 @@
 import os
 import numpy as np
 
-from pandas.io.json import libjson
+import pandas._libs.json as json
 from pandas._libs.tslib import iNaT
 from pandas.compat import StringIO, long, u
 from pandas import compat, isnull
@@ -14,8 +14,8 @@
 from .table_schema import build_table_schema
 from pandas.core.dtypes.common import is_period_dtype
 
-loads = libjson.loads
-dumps = libjson.dumps
+loads = json.loads
+dumps = json.dumps
 
 TABLE_SCHEMA_VERSION = '0.20.0'
 

pandas/core/sparse/series.py

@@ -40,7 +40,7 @@
 from pandas.util._decorators import Appender
 
 import pandas._libs.lib as lib
-import pandas.io.libparsers as libparsers
+import pandas._libs.parsers as parsers
 
 
 # BOM character (byte order mark)
@@ -1460,7 +1460,7 @@ def _convert_to_ndarrays(self, dct, na_values, na_fvalues, verbose=False,
 
             if issubclass(cvals.dtype.type, np.integer) and self.compact_ints:
                 cvals = lib.downcast_int64(
-                    cvals, libparsers.na_values,
+                    cvals, parsers.na_values,
                     self.use_unsigned)
 
             result[c] = cvals
@@ -1579,7 +1579,7 @@ def __init__(self, src, **kwds):
         # #2442
         kwds['allow_leading_cols'] = self.index_col is not False
 
-        self._reader = libparsers.TextReader(src, **kwds)
+        self._reader = parsers.TextReader(src, **kwds)
 
         # XXX
         self.usecols, self.usecols_dtype = _validate_usecols_arg(

pandas/core/window.py

@@ -20,7 +20,7 @@
 import numpy as np
 import struct
 import pandas.io.sas.sas_constants as const
-from pandas.io.sas.libsas import Parser
+from pandas.io.sas._sas import Parser
 
 
 class _subheader_pointer(object):

pandas/io/excel.py

@@ -4,4 +4,4 @@
 warnings.warn("The pandas.json module is deprecated and will be "
               "removed in a future version. Please import from "
               "the pandas.io.json instead", FutureWarning, stacklevel=2)
-from pandas.io.json.libjson import dumps, loads
+from pandas._libs.json import dumps, loads

pandas/io/json/json.py

@@ -4,5 +4,5 @@
 warnings.warn("The pandas.parser module is deprecated and will be "
               "removed in a future version. Please import from "
               "the pandas.io.parser instead", FutureWarning, stacklevel=2)
-from pandas.io.libparsers import na_values
+from pandas._libs.parsers import na_values
 from pandas.io.common import CParserError

pandas/io/parsers.py

@@ -73,7 +73,7 @@ def test_convert_sql_column_decimals(self):
         tm.assert_numpy_array_equal(result, expected)
 
     def test_convert_downcast_int64(self):
-        from pandas.io.libparsers import na_values
+        from pandas._libs.parsers import na_values
 
         arr = np.array([1, 2, 7, 8, 10], dtype=np.int64)
         expected = np.array([1, 2, 7, 8, 10], dtype=np.int8)

pandas/io/sas/sas7bdat.py

@@ -13,7 +13,7 @@
 import decimal
 from functools import partial
 from pandas.compat import range, zip, StringIO, u
-import pandas.io.json.libjson as ujson
+import pandas._libs.json as ujson
 import pandas.compat as compat
 
 import numpy as np

pandas/json.py

@@ -22,8 +22,8 @@
 
 import pandas.util.testing as tm
 
-from pandas.io.libparsers import TextReader
-import pandas.io.libparsers as parser
+from pandas._libs.parsers import TextReader
+import pandas._libs.parsers as parser
 
 
 class TestTextReader(object):

pandas/parser.py

@@ -23,7 +23,7 @@
                            is_platform_windows)
 from pandas.io.common import URLError, urlopen, file_path_to_url
 from pandas.io.html import read_html
-from pandas.io.libparsers import ParserError
+from pandas._libs.parsers import ParserError
 
 import pandas.util.testing as tm
 from pandas.util.testing import makeCustomDataframe as mkdf, network

pandas/tests/dtypes/test_io.py

@@ -10,7 +10,7 @@
 
 from pandas import _np_version_under1p8
 from pandas.core.sparse.api import SparseArray, SparseSeries
-from pandas.core.sparse.libsparse import IntIndex
+from pandas._libs.sparse import IntIndex
 from pandas.util.testing import assert_almost_equal
 import pandas.util.testing as tm
 

pandas/tests/io/json/test_ujson.py

@@ -21,7 +21,7 @@
 from pandas import compat
 from pandas.core.sparse import frame as spf
 
-from pandas.core.sparse.libsparse import BlockIndex, IntIndex
+from pandas._libs.sparse import BlockIndex, IntIndex
 from pandas.core.sparse.api import SparseSeries, SparseDataFrame, SparseArray
 from pandas.tests.frame.test_api import SharedWithSparse
 

pandas/tests/io/parser/test_textreader.py

@@ -8,7 +8,7 @@
 from pandas import compat
 
 from pandas.core.sparse.array import IntIndex, BlockIndex, _make_index
-import pandas.core.sparse.libsparse as splib
+import pandas._libs.sparse as splib
 
 TEST_LENGTH = 20
 

pandas/tests/io/test_html.py

@@ -17,7 +17,7 @@
 
 import pandas.core.sparse.frame as spf
 
-from pandas.core.sparse.libsparse import BlockIndex, IntIndex
+from pandas._libs.sparse import BlockIndex, IntIndex
 from pandas.core.sparse.api import SparseSeries
 from pandas.tests.series.test_api import SharedWithSparse
 

pandas/tests/sparse/test_array.py

@@ -274,12 +274,12 @@ def test_deprecation():
 
     with tm.assert_produces_warning(FutureWarning,
                                     check_stacklevel=False):
-        from pandas.util.hashing import hash_pandas_object
+        from pandas.tools.hashing import hash_pandas_object
         obj = Series(list('abc'))
         hash_pandas_object(obj, hash_key='9876543210123456')
 
     with tm.assert_produces_warning(FutureWarning,
                                     check_stacklevel=False):
-        from pandas.util.hashing import hash_array
+        from pandas.tools.hashing import hash_array
         obj = np.array([1, 2, 3])
         hash_array(obj, hash_key='9876543210123456')

pandas/tests/sparse/test_frame.py

@@ -1476,8 +1476,8 @@ def assert_sp_array_equal(left, right, check_dtype=True):
                              check_dtype=check_dtype)
 
     # SparseIndex comparison
-    assert isinstance(left.sp_index, pd.core.sparse.libsparse.SparseIndex)
-    assert isinstance(right.sp_index, pd.core.sparse.libsparse.SparseIndex)
+    assert isinstance(left.sp_index, pd._libs.sparse.SparseIndex)
+    assert isinstance(right.sp_index, pd._libs.sparse.SparseIndex)
 
     if not left.sp_index.equals(right.sp_index):
         raise_assert_detail('SparseArray.index', 'index are not equal',

pandas/tests/sparse/test_libsparse.py

@@ -118,7 +118,7 @@ def is_platform_mac():
     'hashtable': ['_libs/hashtable_class_helper.pxi.in',
                   '_libs/hashtable_func_helper.pxi.in'],
     'index': ['_libs/index_class_helper.pxi.in'],
-    'sparse': ['core/sparse/sparse_op_helper.pxi.in'],
+    'sparse': ['_libs/sparse_op_helper.pxi.in'],
     'interval': ['_libs/intervaltree.pxi.in']
 }
 
@@ -339,9 +339,9 @@ class CheckSDist(sdist_class):
                  'pandas/_libs/interval.pyx',
                  'pandas/_libs/hashing.pyx',
                  'pandas/_libs/testing.pyx',
-                 'pandas/core/window.pyx',
-                 'pandas/core/sparse/sparse.pyx',
-                 'pandas/io/parsers.pyx',
+                 'pandas/_libs/window.pyx',
+                 'pandas/_libs/sparse.pyx',
+                 'pandas/_libs/parsers.pyx',
                  'pandas/io/sas/sas.pyx']
 
     def initialize_options(self):
@@ -513,24 +513,24 @@ def pxd(name):
     '_libs.interval': {'pyxfile': '_libs/interval',
                        'pxdfiles': ['_libs/hashtable'],
                        'depends': _pxi_dep['interval']},
-    'core.libwindow': {'pyxfile': 'core/window',
-                       'pxdfiles': ['_libs/src/skiplist', '_libs/src/util'],
-                       'depends': ['pandas/_libs/src/skiplist.pyx',
-                                   'pandas/_libs/src/skiplist.h']},
-    'io.libparsers': {'pyxfile': 'io/parsers',
+    '_libs.window': {'pyxfile': '_libs/window',
+                     'pxdfiles': ['_libs/src/skiplist', '_libs/src/util'],
+                     'depends': ['pandas/_libs/src/skiplist.pyx',
+                                 'pandas/_libs/src/skiplist.h']},
+    '_libs.parsers': {'pyxfile': '_libs/parsers',
                       'depends': ['pandas/_libs/src/parser/tokenizer.h',
                                   'pandas/_libs/src/parser/io.h',
                                   'pandas/_libs/src/numpy_helper.h'],
                       'sources': ['pandas/_libs/src/parser/tokenizer.c',
                                   'pandas/_libs/src/parser/io.c']},
-    'core.sparse.libsparse': {'pyxfile': 'core/sparse/sparse',
-                              'depends': (['pandas/core/sparse/sparse.pyx'] +
-                                     _pxi_dep['sparse'])},
+    '_libs.sparse': {'pyxfile': '_libs/sparse',
+                     'depends': (['pandas/core/sparse/sparse.pyx'] +
+                                 _pxi_dep['sparse'])},
     '_libs.testing': {'pyxfile': '_libs/testing',
                       'depends': ['pandas/_libs/testing.pyx']},
     '_libs.hashing': {'pyxfile': '_libs/hashing',
                       'depends': ['pandas/_libs/hashing.pyx']},
-    'io.sas.libsas': {'pyxfile': 'io/sas/sas'},
+    'io.sas._sas': {'pyxfile': 'io/sas/sas'},
     }
 
 extensions = []
@@ -596,7 +596,7 @@ def pxd(name):
             root, _ = os.path.splitext(ext.sources[0])
             ext.sources[0] = root + suffix
 
-ujson_ext = Extension('pandas.io.json.libjson',
+ujson_ext = Extension('pandas._libs.json',
                       depends=['pandas/_libs/src/ujson/lib/ultrajson.h',
                                'pandas/_libs/src/datetime_helper.h',
                                'pandas/_libs/src/numpy_helper.h'],