8000 1.7.x backport by certik · Pull Request #472 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

1.7.x backport #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 1, 2012
Merged

1.7.x backport #472

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
486a36f
BUG: PyErr_SetObject does not steal reference.
seberg Sep 18, 2012
13c7efa
Reset flags when Axes are removed. Array might now be 1D, or removed …
seberg Sep 3, 2012
4b6aa87
Tests related to Issue #387
seberg Sep 4, 2012
d4e25cd
ENH: More capable test functions for warnings
njsmith Sep 20, 2012
2397c9d
FIX: Transition scheme for safer in-place ufunc operations
njsmith Sep 20, 2012
1db4585
STY: fix up style and a few wordings on previous commit
njsmith Sep 20, 2012
f2e34d6
STY: another wording tweak (thanks to @charris)
njsmith Sep 20, 2012
c11c6ed
BUG: allow any axis for np.concatenate for 1D
matthew-brett Sep 13, 2012
91fb6e4
BUG: change FutureWarning to DeprecationWarning
matthew-brett Sep 13, 2012
9ea0f0f
TST: test DeprecationWarning raised by concatenate
matthew-brett Sep 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BUG: change FutureWarning to DeprecationWarning 
Use of PyErr_WarnEx causing failure for Python 2.4.
  • Loading branch information
@matthew-brett @certik
matthew-brett authored and certik committed Oct 1, 2012
commit 91fb6e4f01ffe25671de168ca6d9f6ea19c1a237
8 changes: 5 additions & 3 deletions numpy/core/src/multiarray/multiarraymodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,11 @@ PyArray_ConcatenateArrays(int narrays, PyArrayObject **arrays, int axis)
}

if (ndim == 1 & axis != 0) {
PyErr_WarnEx(PyExc_FutureWarning,
"axis not 0 for ndim == 0; this will raise an error "
"in future versions of numpy", 2);
char msg[] = "axis != 0 for ndim == 1; this will raise an error in "
"future versions of numpy";
if (DEPRECATE(msg) < 0) {
return NULL;
}
axis = 0;
}

Expand Down
2 changes: 1 addition & 1 deletion numpy/core/tests/test_shape_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def test_concatenate_sloppy0():
r4 = list(range(4))
r3 = list(range(3))
assert_array_equal(concatenate((r4, r3), 0), r4 + r3)
warnings.simplefilter('ignore', FutureWarning)
warnings.simplefilter('ignore', DeprecationWarning)
try:
assert_array_equal(concatenate((r4, r3), -10), r4 + r3)
assert_array_equal(concatenate((r4, r3), 10), r4 + r3)
Expand Down
0