REF: refactor/cleanup CSSResolver #36581
Merged
+106
−80
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
pandas/io/formats/excel.py
Outdated
| @@ -64,10 +64,11 @@ class CSSToExcelConverter: | |||
| # without monkey-patching. | |||
|
|
|||
| def __init__(self, inherited: Optional[str] = None): | |||
| self.inherited: Optional[Dict[str, str]] | |||
There was a problem hiding this comment.
this goes outside of __init__:
class Foo:
inherited : SomeType
def __init__(self, ...):
self.inherited = ...
There was a problem hiding this comment.
Changed as you suggested.
jreback
requested changes
Sep 24, 2020
pandas/io/formats/css.py
Outdated
| @@ -75,101 +130,79 @@ def __call__(self, declarations_str, inherited=None): | |||
| props = dict(self.atomize(self.parse(declarations_str))) | |||
| if inherited is None: | |||
| inherited = {} | |||
| assert inherited is not None | |||
There was a problem hiding this comment.
you really need this assert?
There was a problem hiding this comment.
No, indeed, that one I forgot. Thank you.
pandas/io/formats/css.py
Outdated
| # 1. resolve inherited, initial | ||
| for prop, val in inherited.items(): | ||
| if prop not in props: | ||
| props[prop] = val | ||
|
|
||
| for prop, val in list(props.items()): | ||
| for prop, val in props.copy().items(): |
There was a problem hiding this comment.
don't copy in the interable, rather copy first and iterate over the original.
There was a problem hiding this comment.
Changed it. But, out of curiosity, why would it matter?
There was a problem hiding this comment.
doesn't matter, just style-wise its easier to read, e.g. less things then going on in the iteration part
jreback
added
IO HTML
jreback
approved these changes
Sep 24, 2020
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.
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diffRefactor
__call__method ofCSSResolver.