bpo-5664: 2to3 convert Cookie.Cookie properly#15268
bpo-5664: 2to3 convert Cookie.Cookie properly#15268aldwinaldwin wants to merge 5 commits intopython:mainfrom
Conversation
aldwinaldwin
requested review from
brettcannon,
encukou,
ericsnowcurrently,
ncoghlan and
warsaw
as code owners
| @@ -276,6 +276,13 @@ and off individually. They are described here in more detail. | |||
| Handles other modules renames in the standard library. It is separate from | |||
There was a problem hiding this comment.
| Handles other modules renames in the standard library. It is separate from | |
| Handles other module renames in the standard library. It is separate from |
|
|
||
| Handles other modules renames in the standard library. It is separate from | ||
| the :2to3fixer:`imports` and :2to3fixer:`imports2` fixers only because of | ||
| technical limitations. :2to3fixer:`renames` needs to run afterwards to |
There was a problem hiding this comment.
What are these technical limitations?
There was a problem hiding this comment.
Test_imports() would fail, because this fix uses 2 steps. fix_renames does a second change after fix_imports.
|
|
||
| .. 2to3fixer:: imports3 | ||
|
|
||
| Handles other modules renames in the standard library. It is separate from |
There was a problem hiding this comment.
| Handles other modules renames in the standard library. It is separate from | |
| Handles other module renames in the standard library. It is separate from |
| 'htmlentitydefs' : 'html.entities', | ||
| 'HTMLParser' : 'html.parser', | ||
| 'Cookie': 'http.cookies', | ||
| #'Cookie': 'http.cookies', is handled by fix_imports3 + renames |
There was a problem hiding this comment.
I think you can remove this line.
| else: | ||
| # Replace usage of the module. | ||
| bare_name = results["bare_with_attr"][0] | ||
| if isinstance(results["bare_with_attr"],list): |
There was a problem hiding this comment.
| if isinstance(results["bare_with_attr"],list): | |
| if isinstance(results["bare_with_attr"], list): |
| self.transform(node, results) | ||
| else: | ||
| # Replace usage of the module. | ||
| bare_name = results["bare_with_attr"][0] |
There was a problem hiding this comment.
What does this change do? (when is results["bare_with_attr"] not a list?)
There was a problem hiding this comment.
When there is only 1 key/value in MAPPING like in fix_imports3.
|
|
||
|
|
||
| MAPPING = { | ||
| 'Cookie': 'http.cookies', |
There was a problem hiding this comment.
Can you format indentation in this file?
| class Test_imports3(FixerTestCase): | ||
|
|
||
| def setUp(self): | ||
| super(Test_imports3, self).setUp(['imports3', 'renames']) |
There was a problem hiding this comment.
Can you only include imports3 in this test class? You can make a separate test class for the combination of imports3 and renames.
|
@aldwinaldwin Are you still interested on the finish this PR? I could finish it for you if you don't have time :) |
|
@pablogsal Sure, feel free to take over. |
|
Closed under bpo-45544. |
6 participants
https://bugs.python.org/issue5664