Skip to content

Replace uses of the Unicode trait with Str#123

Merged
kitchoi merged 3 commits into
masterfrom
fix/use-of-unicode-trait
Nov 5, 2020
Merged

Replace uses of the Unicode trait with Str#123
kitchoi merged 3 commits into
masterfrom
fix/use-of-unicode-trait

Conversation

@mdickinson
Copy link
Copy Markdown
Member

This PR replaces all uses of the deprecated Unicode trait type with Str.

@mdickinson
Copy link
Copy Markdown
Member Author

I was jumping the gun a bit here. We can't do this until after we've dropped Python 2 support.

@rahulporuri
Copy link
Copy Markdown
Contributor

This PR is ready to go in now because the upcoming release will not support Python 2.

@rahulporuri rahulporuri requested a review from kitchoi October 30, 2020 11:09
@codecov-io
Copy link
Copy Markdown

codecov-io commented Oct 30, 2020

Codecov Report

Merging #123 into master will decrease coverage by 1.53%.
The diff coverage is 26.92%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #123      +/-   ##
==========================================
- Coverage   41.67%   40.13%   -1.54%     
==========================================
  Files         240      240              
  Lines        8912     8909       -3     
  Branches     1105     1161      +56     
==========================================
- Hits         3714     3576     -138     
- Misses       5044     5189     +145     
+ Partials      154      144      -10     
Impacted Files Coverage Δ
...ools/appscripting/action/start_recording_action.py 0.00% <0.00%> (ø)
...tools/appscripting/action/stop_recording_action.py 0.00% <0.00%> (ø)
apptools/appscripting/i_script_manager.py 0.00% <0.00%> (ø)
apptools/appscripting/script_manager.py 0.00% <0.00%> (ø)
apptools/help/help_plugin/help_plugin.py 0.00% <0.00%> (ø)
apptools/help/help_plugin/help_submenu_manager.py 0.00% <ø> (ø)
apptools/help/help_plugin/preferences_pages.py 0.00% <ø> (ø)
apptools/io/file.py 82.03% <ø> (ø)
apptools/logger/agent/quality_agent_view.py 0.00% <ø> (ø)
apptools/logger/custom_excepthook.py 0.00% <ø> (ø)
... and 121 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ac27f66...690153f. Read the comment docs.

@kitchoi
Copy link
Copy Markdown
Contributor

kitchoi commented Oct 30, 2020

This PR is ready to go in now because the upcoming release will not support Python 2.

I am not sure what sequence of events we are going after here for #120.
e.g. I'd think both setup.py and etstool.py need to be updated to prevent Python 2 from being used before changes like this PR goes ahead.

@rahulporuri
Copy link
Copy Markdown
Contributor

I think we can merge this after #190 is merged (after fixing merge conflicts of course).

Copy link
Copy Markdown
Contributor

@kitchoi kitchoi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kitchoi
Copy link
Copy Markdown
Contributor

kitchoi commented Nov 5, 2020

I will be resolving the conflicts...

ratio = Float(1.0)
visible = Bool(True)
description = Unicode(u'description')
description = Str(u'description')
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could go further and drop the u prefixes, but that's probably best done in a separate PR.

Copy link
Copy Markdown
Member Author

@mdickinson mdickinson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kitchoi Thank you for the changes! I can't officially approve because I opened the PR in the first place, but LGTM.

Copy link
Copy Markdown
Contributor

@aaronayres35 aaronayres35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kitchoi
Copy link
Copy Markdown
Contributor

kitchoi commented Nov 5, 2020

Thank you all!

@kitchoi kitchoi merged commit 91e6cff into master Nov 5, 2020
@kitchoi kitchoi deleted the fix/use-of-unicode-trait branch November 5, 2020 17:19
@kitchoi kitchoi mentioned this pull request Nov 10, 2020
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants