[Numpy-svn] [numpy/numpy] 3f0cb8: ENH: better error message for invalid axis and con...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: 3f0cb83f128f3bc61ff9eae2ff5bdc882c922a93
      https://github.com/numpy/numpy/commit/3f0cb83f128f3bc61ff9eae2ff5bdc882c922a93
  Author: Julian Taylor <jtaylor.debian at googlemail.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M numpy/core/src/multiarray/conversion_utils.c
    M numpy/core/src/multiarray/multiarraymodule.c

  Log Message:
  -----------
  ENH: better error message for invalid axis and concatenate inputs

the old errors
np.concatenate(1,2)
TypeError: object of type 'int' has no len()

concatenate([1], [2])
TypeError: an integer is required

are not very unhelpful, add a new internal function that allows adding
some context to axis argument conversion failures and check for sequence
inputs in concatenate.
Closes gh-4923.


  Commit: 7e53e9b6f50ba98aafb73147917dfc39743fffd0
      https://github.com/numpy/numpy/commit/7e53e9b6f50ba98aafb73147917dfc39743fffd0
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2014-08-04 (Mon, 04 Aug 2014)

  Changed paths:
    M numpy/core/src/multiarray/conversion_utils.c
    M numpy/core/src/multiarray/multiarraymodule.c

  Log Message:
  -----------
  Merge pull request #4926 from juliantaylor/concatenate-error

ENH: better error message for invalid axis and concatenate inputs


Compare: https://github.com/numpy/numpy/compare/e65c9aabc470...7e53e9b6f50b