numpy/numpy — pull request #4937 by charris (2014-08-01 01:13:02+00:00)
Title: Pep8 numpy random

Rebased for backport to 1.9.x if wanted. Also fixed a FutureWarning in numpy.random.choice.