[Numpy-svn] [numpy/numpy] fcce02: ENH: core: add hack enabling unpickling Py2 pickle...

[GitHub]

  Branch: refs/heads/maintenance/1.9.x
  Home:   https://github.com/numpy/numpy
  Commit: fcce0274a683add16a76e1b41288796a27682f9a
      https://github.com/numpy/numpy/commit/fcce0274a683add16a76e1b41288796a27682f9a
  Author: Pauli Virtanen <pav at iki.fi>
  Date:   2014-07-19 (Sat, 19 Jul 2014)

  Changed paths:
    M numpy/core/src/multiarray/multiarraymodule.c
    M numpy/core/tests/test_regression.py

  Log Message:
  -----------
  ENH: core: add hack enabling unpickling Py2 pickled scalars on Py3 under encoding='latin1'

There is a similar hack in place for arrays, but scalar unpickling was not covered.

Provides a workaround for gh-4879


  Commit: 3c6631574333ec31ddf6911938c6f18cf2d64a3d
      https://github.com/numpy/numpy/commit/3c6631574333ec31ddf6911938c6f18cf2d64a3d
  Author: Julian Taylor <jtaylor.debian at googlemail.com>
  Date:   2014-07-19 (Sat, 19 Jul 2014)

  Changed paths:
    M numpy/core/src/multiarray/multiarraymodule.c
    M numpy/core/tests/test_regression.py

  Log Message:
  -----------
  Merge pull request #4883 from pv/fix-scalar-unpickle-py3

ENH: core: add hack enabling unpickling Py2 pickled scalars on Py3 under encoding='latin1'


Compare: https://github.com/numpy/numpy/compare/6805122c5ac6...3c6631574333