MAINT: Python2 Cleanups #15379
Merged
MAINT: Python2 Cleanups #15379
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sethtroisi
commented
Jan 21, 2020
| @@ -341,24 +341,6 @@ def test_complex(self): | |||
| self._assert_func(x, x) | |||
| self._test_not_equal(x, y) | |||
|
|
|||
| def test_error_message(self): | |||
There was a problem hiding this comment.
Seems silly to have the duplicate test, and the above test says "moved here" not "copied here".
"# 2018-04-29: moved here from testing.tests.test_utils."
I'll investigate history if I have time
| @@ -155,7 +155,7 @@ def from_filename(cls, filename, namespace=None, encoding=None, | |||
| c = f.read() | |||
| if encoding: | |||
| c = c.decode(encoding) | |||
| elif PY3: | |||
| else: | |||
| c = c.decode('latin-1') | |||
There was a problem hiding this comment.
In the original CL this wasn't nested under "else:" but I believe that was a mistake
| Traceback (most recent call last): | ||
| ... | ||
| tempita.TemplateError: {{ inside expression at line 1 column 10 | ||
| """ |
There was a problem hiding this comment.
I trimmed a blank newline here
|
Close/Reopen to check of tests again. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I pulled these changes out of #13852