summaryrefslogtreecommitdiff
path: root/numpy/linalg/linalg.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-06-21 16:10:24 -0400
committerCharles Harris <charlesr.harris@gmail.com>2015-06-21 16:10:24 -0400
commite3b2bc0b0f31482cd112660393245116ae55ecbf (patch)
treef00cdd12d96cca0a694f46d4bf0ba60dc2cf1ebd /numpy/linalg/linalg.py
parent95b2c24820759397695ece5f512e930e7c1712cf (diff)
parenta27f56069fb883c44dd4986d15e751162d85b621 (diff)
downloadnumpy-e3b2bc0b0f31482cd112660393245116ae55ecbf.tar.gz
Merge pull request #5990 from charris/1.10-deprecated-removal
1.10 deprecated removal
Diffstat (limited to 'numpy/linalg/linalg.py')
-rw-r--r--numpy/linalg/linalg.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 9fd70d14d..45e12f1a3 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -730,12 +730,14 @@ def qr(a, mode='reduced'):
"""
if mode not in ('reduced', 'complete', 'r', 'raw'):
if mode in ('f', 'full'):
+ # 2013-04-01, 1.8
msg = "".join((
"The 'full' option is deprecated in favor of 'reduced'.\n",
"For backward compatibility let mode default."))
warnings.warn(msg, DeprecationWarning)
mode = 'reduced'
elif mode in ('e', 'economic'):
+ # 2013-04-01, 1.8
msg = "The 'economic' option is deprecated.",
warnings.warn(msg, DeprecationWarning)
mode = 'economic'