GeezerVison is showing github.com — remove python2 future imports · python-control/python-control@7d97ef9
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: control/delay.py -1Lines changed: 0 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 42 | 42 | # | 43 | 43 | # $Id$ | 44 | 44 |
| 45 | | -from __future__ import division | 46 | 45 |
| 47 | 46 | __all__ = ['pade'] | 48 | 47 |
| |
Collapse file Copy file name to clipboardExpand all lines: control/frdata.py -1Lines changed: 0 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 35 | 35 | # Author: M.M. (Rene) van Paassen (using xferfcn.py as basis) | 36 | 36 | # Date: 02 Oct 12 | 37 | 37 |
| 38 | | -from __future__ import division | 39 | 38 |
| 40 | 39 | """ | 41 | 40 | Frequency response data representation and functions. | |
Collapse file Copy file name to clipboardExpand all lines: control/margins.py -3Lines changed: 0 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 9 | 9 | margins.margin | 10 | 10 | """ | 11 | 11 |
| 12 | | -# Python 3 compatibility (needs to go here) | 13 | | -from __future__ import print_function | 14 | | - | 15 | 12 | """Copyright (c) 2011 by California Institute of Technology | 16 | 13 | All rights reserved. | 17 | 14 |
| |
Collapse file Copy file name to clipboardExpand all lines: control/modelsimp.py -3Lines changed: 0 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 40 | 40 | # | 41 | 41 | # $Id$ | 42 | 42 |
| 43 | | -# Python 3 compatibility | 44 | | -from __future__ import print_function | 45 | | - | 46 | 43 | # External packages and modules | 47 | 44 | import numpy as np | 48 | 45 | import warnings | |
Collapse file Copy file name to clipboardExpand all lines: control/phaseplot.py -3Lines changed: 0 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 34 | 34 | # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 35 | 35 | # POSSIBILITY OF SUCH DAMAGE. | 36 | 36 |
| 37 | | -# Python 3 compatibility | 38 | | -from __future__ import print_function | 39 | | - | 40 | 37 | import numpy as np | 41 | 38 | import matplotlib.pyplot as mpl | 42 | 39 |
| |
Collapse file Copy file name to clipboardExpand all lines: control/statesp.py -4Lines changed: 0 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 8 | 8 |
| 9 | 9 | """ | 10 | 10 |
| 11 | | -# Python 3 compatibility (needs to go here) | 12 | | -from __future__ import print_function | 13 | | -from __future__ import division # for _convert_to_statespace | 14 | | - | 15 | 11 | """Copyright (c) 2010 by California Institute of Technology | 16 | 12 | All rights reserved. | 17 | 13 |
| |
Collapse file Copy file name to clipboardExpand all lines: control/tests/convert_test.py -2Lines changed: 0 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 14 | 14 |
| 15 | 15 | """ | 16 | 16 |
| 17 | | -from __future__ import print_function | 18 | | -from warnings import warn | 19 | 17 |
| 20 | 18 | import numpy as np | 21 | 19 | import pytest | |
Collapse file Copy file name to clipboardExpand all lines: control/tests/delay_test.py -3Lines changed: 0 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 4 | 4 | Primitive; ideally test to numerical limits | 5 | 5 | """ | 6 | 6 |
| 7 | | -from __future__ import division | 8 | | - | 9 | 7 | import numpy as np | 10 | 8 | import pytest | 11 | 9 |
| @@ -94,4 +92,3 @@ def testT0(self): | 94 | 92 | np.array(refnum), np.array(num)) | 95 | 93 | np.testing.assert_array_almost_equal_nulp( | 96 | 94 | np.array(refden), np.array(den)) | 97 | | - |
Collapse file Copy file name to clipboardExpand all lines: control/tests/iosys_test.py +1-3Lines changed: 1 addition & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 8 | 8 | created for that purpose. | 9 | 9 | """ | 10 | 10 |
| 11 | | -from __future__ import print_function | 12 | 11 | import re | 13 | 12 |
| 14 | 13 | import numpy as np | 15 | 14 | import pytest | 16 | | -import scipy as sp | 17 | 15 |
| 18 | 16 | import control as ct | 19 | 17 | from control import iosys as ios | @@ -1270,7 +1268,7 @@ def test_lineariosys_statespace(self, tsys): | 1270 | 1268 | (2, 2, 'rss', ct.LinearIOSystem.__rsub__, 2, 2), | 1271 | 1269 | (2, 2, 2, ct.LinearIOSystem.__rsub__, 2, 2), | 1272 | 1270 | (2, 2, np.random.rand(2, 2), ct.LinearIOSystem.__rsub__, 2, 2), | 1273 | | - | | 1271 | +
| 1274 | 1272 | ]) | 1275 | 1273 | def test_operand_conversion(self, Pout, Pin, C, op, PCout, PCin): | 1276 | 1274 | P = ct.LinearIOSystem( | |
Collapse file Copy file name to clipboardExpand all lines: control/tests/margin_test.py -1Lines changed: 0 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 6 | 6 | BG, 30 Jun 2020 -- convert to pytest, gh-425 | 7 | 7 | BG, 16 Nov 2020 -- pick from gh-438 and add discrete test | 8 | 8 | """ | 9 | | -from __future__ import print_function | 10 | 9 |
| 11 | 10 | import numpy as np | 12 | 11 | import pytest | |
|