Commit 9af1ca1
remove python 2 lines (#757)
* Resolve merge conflicts.
The upstream what's new file had been updated.
* Remove py2 and Windows checks.
Removed because python 2 is no longer supported, and this let us remove the
checks for Windows too.
* Remove from __future__ import print_function.
* Remove from __future__ import division.
* Revert "Remove py2 and Windows checks."
This reverts commit a762fc3.
* Remove has_python2 checks.
* Remove duplicate line in what's new file.
* Remove python2-sensitive imports.
* Remove out-of-date python2 comment.
* Import JSONDecodeError directly in py3 way.
* Change Tkinter import (py2) to tkinter (py3).
* Update import configparser to only py3 version.
* Update documentation comment.
* Remove strict arguments.
The case where these were relevant (Windows build using Python 2) is no
longer used because Python 2 is no longer supported.
* Remove platform_is_windows import.
It is no longer used.
* Set strict arg to True for two tests.
* Fix indentation mistake.
Convert tabs to spaces.
* Revert "Remove from __future__ import print_function."
This reverts commit 0508b33.
This also undoes the changes to how configparser is imported.1 parent d6536c9 commit 9af1ca1
File tree
15 files changed
+16
-67
lines changed- pvlib
- iotools
- test
15 files changed
+16
-67
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
8 | 6 | | |
9 | 7 | | |
10 | 8 | | |
| |||
211 | 209 | | |
212 | 210 | | |
213 | 211 | | |
214 | | - | |
215 | | - | |
| 212 | + | |
216 | 213 | | |
217 | 214 | | |
218 | 215 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
8 | 6 | | |
9 | 7 | | |
10 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
| 6 | + | |
13 | 7 | | |
14 | 8 | | |
15 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
| 10 | + | |
15 | 11 | | |
16 | 12 | | |
17 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
| 5 | + | |
12 | 6 | | |
13 | 7 | | |
14 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
| 8 | + | |
15 | 9 | | |
16 | 10 | | |
17 | 11 | | |
| |||
160 | 154 | | |
161 | 155 | | |
162 | 156 | | |
163 | | - | |
| 157 | + | |
164 | 158 | | |
165 | 159 | | |
166 | 160 | | |
| |||
210 | 204 | | |
211 | 205 | | |
212 | 206 | | |
213 | | - | |
214 | | - | |
215 | | - | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
216 | 210 | | |
217 | 211 | | |
218 | 212 | | |
| |||
406 | 400 | | |
407 | 401 | | |
408 | 402 | | |
409 | | - | |
| 403 | + | |
410 | 404 | | |
411 | 405 | | |
412 | 406 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
9 | 7 | | |
10 | 8 | | |
11 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
8 | 6 | | |
9 | 7 | | |
10 | 8 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
| 9 | + | |
16 | 10 | | |
17 | 11 | | |
18 | 12 | | |
| |||
1787 | 1781 | | |
1788 | 1782 | | |
1789 | 1783 | | |
1790 | | - | |
1791 | | - | |
1792 | | - | |
1793 | | - | |
1794 | | - | |
1795 | | - | |
1796 | | - | |
1797 | | - | |
| 1784 | + | |
| 1785 | + | |
1798 | 1786 | | |
1799 | 1787 | | |
1800 | 1788 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
| |||
0 commit comments