@@ -144,7 +144,7 @@ def use_numpy_matrix(flag=True, warn=True):
144
144
Parameters
145
145
----------
146
146
flag : bool
147
- If flag is `True` (default), use the Numpy (soon to be deprecated)
147
+ If flag is `True` (default), use the deprecated Numpy
148
148
`matrix` class to represent matrices in the `~control.StateSpace`
149
149
class and functions. If flat is `False`, then matrices are
150
150
represented by a 2D `ndarray` object.
@@ -161,8 +161,8 @@ class and functions. If flat is `False`, then matrices are
161
161
space operations is a 2D array.
162
162
"""
163
163
if flag and warn :
164
- warnings .warn ("Return type numpy.matrix is soon to be deprecated." ,
165
- stacklevel = 2 )
164
+ warnings .warn ("Return type numpy.matrix is deprecated." ,
165
+ stacklevel = 2 , category = DeprecationWarning )
166
166
set_defaults ('statesp' , use_numpy_matrix = flag )
167
167
168
168
def use_legacy_defaults (version ):
@@ -171,7 +171,7 @@ def use_legacy_defaults(version):
171
171
Parameters
172
172
----------
173
173
version : string
174
- Version number of the defaults desired. Ranges from '0.1' to '0.8.4'.
174
+ Version number of the defaults desired. Ranges from '0.1' to '0.8.4'.
175
175
"""
176
176
import re
177
177
(major , minor , patch ) = (None , None , None ) # default values
@@ -189,7 +189,7 @@ def use_legacy_defaults(version):
189
189
match = re .match ("[vV]?0.([3-6])([a-d])" , version )
190
190
if match : (major , minor , patch ) = \
191
191
(0 , int (match .group (1 )), ord (match .group (2 )) - ord ('a' ) + 1 )
192
-
192
+
193
193
# Abbreviated version format: vM.N or M.N
194
194
match = re .match ("([vV]?[0-9]).([0-9])" , version )
195
195
if match : (major , minor , patch ) = \
0 commit comments