SG-36835 Python 2 removal #197
Open
+83
−92
Conversation
This file contains 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
carlos-villavicencio-adsk
approved these changes
Dec 3, 2024
hooks/collector.py
Outdated
| @@ -429,7 +433,7 @@ def _get_item_info(self, path): | |||
| # the system's default encoding. If a unicode string is | |||
| # returned, we simply ensure it's utf-8 encoded to avoid issues | |||
| # with toolkit, which expects utf-8 | |||
| category_type = six.ensure_str(category_type) | |||
| category_type = sgutils.ensure_str(category_type) | |||
There was a problem hiding this comment.
It seems category_type can be a Optional[str] type according to the documentation of guess_type function: https://docs.python.org/3.9/library/mimetypes.html#mimetypes.guess_type. So I think it can be safe to use just str.
The main difference here with ensure_str is that this function will raise an error when the argument is None, instead of converting None to 'None'.
| @@ -399,7 +403,7 @@ def _get_item_info(self, path): | |||
| # the system's default encoding. If a unicode string is | |||
| # returned, we simply ensure it's utf-8 encoded to avoid issues | |||
| # with toolkit, which expects utf-8 | |||
| category_type = six.ensure_str(category_type) | |||
| category_type = sgutils.ensure_str(category_type) | |||
There was a problem hiding this comment.
Same as my previous comment. This is a unit test so here is the perfect chance to check some use cases.
julien-lang
requested changes
Dec 3, 2024
julien-lang
reviewed
Dec 5, 2024
julien-lang
approved these changes
Dec 6, 2024
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.
Description
Python 2 removal
Test
Analyzes the given file and creates one or more items to represent it.
Makes sure that the right hand side details section reflects the selected item in the left hand side tree.
When someone drops stuff into the publish.
