pandas.msgpack pandas.io.msgpack

Author: jreback

asv_bench/benchmarks/binary_ops.py

@@ -107,4 +107,4 @@ def setup(self):
         self.s = Series(date_range('20010101', periods=self.N, freq='T', tz='US/Eastern'))
         self.ts = self.s[self.halfway]
 
-        self.s2 = Series(date_range('20010101', periods=self.N, freq='s',  tz='US/Eastern'))
+        self.s2 = Series(date_range('20010101', periods=self.N, freq='s',  tz='US/Eastern'))

asv_bench/benchmarks/panel_methods.py

@@ -21,4 +21,4 @@ def time_shift(self):
         self.panel.shift(1)
 
     def time_shift_minor(self):
-        self.panel.shift(1, axis='minor')
+        self.panel.shift(1, axis='minor')

doc/source/whatsnew/v0.20.0.txt

@@ -451,15 +451,17 @@ New Behavior:
 Extension Modules Moving
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-Some formerly public extension modules have been moved and/or renamed. These are deprecated from the public API. (:issue:`12588`)
+Some formerly public extension modules have been moved and/or renamed. These are all removed from the public API.
+If indicated, a deprecation warning will be issued if you reference that module. (:issue:`12588`)
 
 .. csv-table::
-    :header: "Previous Location", "New Location"
-    :widths: 35, 35
+    :header: "Previous Location", "New Location", "Deprecated", "Removed"
+    :widths: 30, 30, 4, 4
 
-    "pandas.json", "pandas.io.json.libjson"
-    "pandas.parser", "pandas.io.libparsers"
-    "pandas.io.sas.saslib", "pandas.io.sas.libsas"
+    "pandas.json", "pandas.io.json.libjson", "X", ""
+    "pandas.parser", "pandas.io.libparsers", "X", ""
+    "pandas.io.sas.saslib", "pandas.io.sas.libsas", "", "X"
+    "pandas.msgpack", "pandas.io.msgpack", "", "X"
 
 
 .. _whatsnew_0200.api_breaking.groupby_describe:

pandas/msgpack/__init__.py renamed to pandas/io/msgpack/__init__.py

@@ -2,8 +2,8 @@
 
 from collections import namedtuple
 
-from pandas.msgpack.exceptions import *  # noqa
-from pandas.msgpack._version import version  # noqa
+from pandas.io.msgpack.exceptions import *  # noqa
+from pandas.io.msgpack._version import version  # noqa
 
 
 class ExtType(namedtuple('ExtType', 'code data')):
@@ -19,8 +19,8 @@ def __new__(cls, code, data):
 
 import os  # noqa
 
-from pandas.msgpack._packer import Packer  # noqa
-from pandas.msgpack._unpacker import unpack, unpackb, Unpacker  # noqa
+from pandas.io.msgpack._packer import Packer  # noqa
+from pandas.io.msgpack._unpacker import unpack, unpackb, Unpacker  # noqa
 
 
 def pack(o, stream, **kwargs):

pandas/msgpack/_packer.pyx renamed to pandas/io/msgpack/_packer.pyx

@@ -6,11 +6,11 @@ from libc.stdlib cimport *
 from libc.string cimport *
 from libc.limits cimport *
 
-from pandas.msgpack.exceptions import PackValueError
-from pandas.msgpack import ExtType
+from pandas.io.msgpack.exceptions import PackValueError
+from pandas.io.msgpack import ExtType
 
 
-cdef extern from "../src/msgpack/pack.h":
+cdef extern from "../../src/msgpack/pack.h":
     struct msgpack_packer:
         char* buf
         size_t length

pandas/msgpack/_unpacker.pyx renamed to pandas/io/msgpack/_unpacker.pyx

@@ -11,12 +11,12 @@ from libc.stdlib cimport *
 from libc.string cimport *
 from libc.limits cimport *
 
-from pandas.msgpack.exceptions import (BufferFull, OutOfData,
+from pandas.io.msgpack.exceptions import (BufferFull, OutOfData,
                                        UnpackValueError, ExtraData)
-from pandas.msgpack import ExtType
+from pandas.io.msgpack import ExtType
 
 
-cdef extern from "../src/msgpack/unpack.h":
+cdef extern from "../../src/msgpack/unpack.h":
     ctypedef struct msgpack_user:
         bint use_list
         PyObject* object_hook

pandas/msgpack/_version.py renamed to pandas/io/msgpack/_version.py

@@ -64,7 +64,7 @@
 from pandas.core.internals import BlockManager, make_block, _safe_reshape
 import pandas.core.internals as internals
 
-from pandas.msgpack import Unpacker as _Unpacker, Packer as _Packer, ExtType
+from pandas.io.msgpack import Unpacker as _Unpacker, Packer as _Packer, ExtType
 from pandas.util._move import (
     BadMove as _BadMove,
     move_into_mutable_buffer as _move_into_mutable_buffer,

pandas/msgpack/exceptions.py renamed to pandas/io/msgpack/exceptions.py

@@ -33,7 +33,7 @@ class TestPDApi(Base, tm.TestCase):
     # top-level sub-packages
     lib = ['api', 'compat', 'computation', 'core',
            'indexes', 'formats', 'pandas',
-           'test', 'tools', 'tseries', 'msgpack', 'sparse',
+           'test', 'tools', 'tseries', 'sparse',
            'types', 'util', 'options', 'io']
 
     # top-level packages that are c-imports, should rename to _*

pandas/io/packers.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from pandas.msgpack import packb, unpackb
+from pandas.io.msgpack import packb, unpackb
 
 
 def test_unpack_buffer():

pandas/tests/api/test_api.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from pandas.msgpack import packb, unpackb
+from pandas.io.msgpack import packb, unpackb
 
 
 def check(length, obj):

pandas/tests/msgpack/__init__.py renamed to pandas/tests/io/msgpack/__init__.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 import unittest
-from pandas.msgpack import packb, unpackb
+from pandas.io.msgpack import packb, unpackb
 
 
 class DummyException(Exception):

pandas/tests/msgpack/test_buffer.py renamed to pandas/tests/io/msgpack/test_buffer.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 import array
-import pandas.msgpack as msgpack
-from pandas.msgpack import ExtType
+import pandas.io.msgpack as msgpack
+from pandas.io.msgpack import ExtType
 
 
 def test_pack_ext_type():

pandas/tests/msgpack/test_case.py renamed to pandas/tests/io/msgpack/test_case.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from pandas.msgpack import unpackb
+from pandas.io.msgpack import unpackb
 
 
 def check(src, should, use_list=0):

pandas/tests/msgpack/test_except.py renamed to pandas/tests/io/msgpack/test_except.py

@@ -3,7 +3,7 @@
                         unicode_literals)
 import pandas.util.testing as tm
 
-from pandas.msgpack import packb, unpackb, Packer, Unpacker, ExtType
+from pandas.io.msgpack import packb, unpackb, Packer, Unpacker, ExtType
 
 
 class TestLimits(tm.TestCase):

pandas/tests/msgpack/test_extension.py renamed to pandas/tests/io/msgpack/test_extension.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from pandas.msgpack import packb, unpackb, ExtType
+from pandas.io.msgpack import packb, unpackb, ExtType
 
 
 def test_str8():

pandas/tests/msgpack/test_format.py renamed to pandas/tests/io/msgpack/test_format.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 import unittest
-from pandas.msgpack import packb, unpackb
+from pandas.io.msgpack import packb, unpackb
 
 
 class DecodeError(Exception):

pandas/tests/msgpack/test_limits.py renamed to pandas/tests/io/msgpack/test_limits.py

@@ -5,7 +5,7 @@
 import struct
 from pandas import compat
 from pandas.compat import u, OrderedDict
-from pandas.msgpack import packb, unpackb, Unpacker, Packer
+from pandas.io.msgpack import packb, unpackb, Unpacker, Packer
 
 
 class TestPack(unittest.TestCase):

pandas/tests/msgpack/test_newspec.py renamed to pandas/tests/io/msgpack/test_newspec.py

@@ -1,5 +1,5 @@
 """Test Unpacker's read_array_header and read_map_header methods"""
-from pandas.msgpack import packb, Unpacker, OutOfData
+from pandas.io.msgpack import packb, Unpacker, OutOfData
 UnexpectedTypeException = ValueError
 
 

pandas/tests/msgpack/test_obj.py renamed to pandas/tests/io/msgpack/test_obj.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 import io
-import pandas.msgpack as msgpack
+import pandas.io.msgpack as msgpack
 
 binarydata = bytes(bytearray(range(256)))
 

pandas/tests/msgpack/test_pack.py renamed to pandas/tests/io/msgpack/test_pack.py

@@ -3,8 +3,8 @@
 import unittest
 
 from pandas import compat
-from pandas.msgpack import Unpacker, BufferFull
-from pandas.msgpack import OutOfData
+from pandas.io.msgpack import Unpacker, BufferFull
+from pandas.io.msgpack import OutOfData
 
 
 class TestPack(unittest.TestCase):

pandas/tests/msgpack/test_read_size.py renamed to pandas/tests/io/msgpack/test_read_size.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from pandas.msgpack import packb
+from pandas.io.msgpack import packb
 from collections import namedtuple
 
 

pandas/tests/msgpack/test_seq.py renamed to pandas/tests/io/msgpack/test_seq.py

@@ -1,6 +1,6 @@
 from io import BytesIO
 import sys
-from pandas.msgpack import Unpacker, packb, OutOfData, ExtType
+from pandas.io.msgpack import Unpacker, packb, OutOfData, ExtType
 import pandas.util.testing as tm
 import pytest
 

pandas/tests/msgpack/test_sequnpack.py renamed to pandas/tests/io/msgpack/test_sequnpack.py

@@ -1,7 +1,7 @@
 """Tests for cases where the user seeks to obtain packed msgpack objects"""
 
 import io
-from pandas.msgpack import Unpacker, packb
+from pandas.io.msgpack import Unpacker, packb
 
 
 def test_write_bytes():

pandas/tests/msgpack/test_subtype.py renamed to pandas/tests/io/msgpack/test_subtype.py

@@ -548,23 +548,23 @@ def pxd(name):
 else:
     macros = [('__LITTLE_ENDIAN__', '1')]
 
-packer_ext = Extension('pandas.msgpack._packer',
+packer_ext = Extension('pandas.io.msgpack._packer',
                         depends=['pandas/src/msgpack/pack.h',
                                  'pandas/src/msgpack/pack_template.h'],
                         sources = [srcpath('_packer',
                                    suffix=suffix if suffix == '.pyx' else '.cpp',
-                                   subdir='msgpack')],
+                                   subdir='io/msgpack')],
                         language='c++',
                         include_dirs=['pandas/src/msgpack'] + common_include,
                         define_macros=macros,
                         extra_compile_args=extra_compile_args)
-unpacker_ext = Extension('pandas.msgpack._unpacker',
+unpacker_ext = Extension('pandas.io.msgpack._unpacker',
                         depends=['pandas/src/msgpack/unpack.h',
                                  'pandas/src/msgpack/unpack_define.h',
                                  'pandas/src/msgpack/unpack_template.h'],
                         sources = [srcpath('_unpacker',
                                    suffix=suffix if suffix == '.pyx' else '.cpp',
-                                   subdir='msgpack')],
+                                   subdir='io/msgpack')],
                         language='c++',
                         include_dirs=['pandas/src/msgpack'] + common_include,
                         define_macros=macros,
@@ -630,6 +630,7 @@ def pxd(name):
                 'pandas.io',
                 'pandas.io.json',
                 'pandas.io.sas',
+                'pandas.io.msgpack',
                 'pandas.formats',
                 'pandas.sparse',
                 'pandas.stats',
@@ -646,10 +647,10 @@ def pxd(name):
                 'pandas.tests.io.json',
                 'pandas.tests.io.parser',
                 'pandas.tests.io.sas',
+                'pandas.tests.io.msgpack',
                 'pandas.tests.groupby',
                 'pandas.tests.series',
                 'pandas.tests.formats',
-                'pandas.tests.msgpack',
                 'pandas.tests.scalar',
                 'pandas.tests.sparse',
                 'pandas.tests.tseries',
@@ -659,7 +660,6 @@ def pxd(name):
                 'pandas.tools',
                 'pandas.tseries',
                 'pandas.types',
-                'pandas.msgpack',
                 'pandas.util.clipboard'
                 ],
       package_data={'pandas.tests': ['data/*.csv'],