Code

Fixup gh 5864#5964

Code

Merged

charris merged 9 commits intonumpy:masternumpy/numpy:masterfrom

charris:fixup-gh-5864charris/numpy:fixup-gh-5864Copy head branch name to clipboard

Jun 14, 2015

Commits

Commits on Jun 13, 2015

• MAINT: move the special case for string comparison before the regular case

  Show description for 4b1f508
  

  njsmith

  authored and

  charris

  committed
  4b1f508

  Copy full SHA for 4b1f508

• MAINT: move the special case for void comparison before the regular case

  Show description for 1e3ab40
  

  njsmith

  authored and

  charris

  committed
  1e3ab40

  Copy full SHA for 1e3ab40

• MAINT: add __array_priority__ special case to masked array binary ops

  Show description for a0643f5
  

  njsmith

  authored and

  charris

  committed
  a0643f5

  Copy full SHA for a0643f5

• MAINT: Remove NotImplemented handling from ufuncs (almost)

  Show description for 6bf0e41
  

  njsmith

  authored and

  charris

  committed
  6bf0e41

  Copy full SHA for 6bf0e41

• MAINT: make the deprecation warnings a little more distinctive

  Show description for c65a751
  

  njsmith

  authored and

  charris

  committed
  c65a751

  Copy full SHA for c65a751

• BUG: Fix test_void_dtype_equality_failures for Python 3.

  Show description for df148e1
  charris

  committed
  df148e1

  Copy full SHA for df148e1

• STY: Minor style cleanups in tests and C code.

  Show description for 0aa3260
  charris

  committed
  0aa3260

  Copy full SHA for 0aa3260

Commits on Jun 14, 2015

• TST: Test that NotImplemented is not longer returned

  Show description for 3b3edd9
  charris

  committed
  3b3edd9

  Copy full SHA for 3b3edd9

• TST: Test __array_priority__ for different class combinations.

  Show description for ed031c2
  charris

  committed
  ed031c2

  Copy full SHA for ed031c2