REF: Replace os.path with pathlib.Path in pandas_web.py #61604
+25
−29
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
| @@ -100,20 +100,17 @@ def blog_add_posts(context): | |||
| posts = [] | |||
| # posts from the file system | |||
| if context["blog"]["posts_path"]: | |||
| posts_path = os.path.join( | |||
| context["source_path"], *context["blog"]["posts_path"].split("/") | |||
| posts_path = pathlib.Path(context["source_path"]) / pathlib.Path( | |||
There was a problem hiding this comment.
I don't think the second one needs to be a pathlib object if tbe first it's already one, it should work if it's a string
| @@ -394,7 +391,7 @@ def get_context(config_fname: str, **kwargs): | |||
| with open(config_fname, encoding="utf-8") as f: | |||
There was a problem hiding this comment.
Shouldn't config_fname be a pathlib too?
| @@ -414,9 +411,9 @@ def get_source_files(source_path: str) -> typing.Generator[str, None, None]: | |||
| Generate the list of files present in the source directory. | |||
| """ | |||
| for root, dirs, fnames in os.walk(source_path): | |||
There was a problem hiding this comment.
If you make source_path a pathlib I don't think you need to convert later.
| try: | ||
| json.load(f) | ||
| except json.JSONDecodeError as e: | ||
| raise RuntimeError( | ||
| f"Invalid versions.json: {e}. Ensure it is valid JSON." | ||
| ) from e | ||
|
|
||
| config_fname = os.path.join(source_path, "config.yml") | ||
| config_fname = pathlib.Path(source_path) / "config.yml" |
There was a problem hiding this comment.
You are making source_path a pathlib twice. Ideally we want paths to be a pathlib since they are created. Not create them as str and convert when there is an operation. For everything that is a path, also config_path and others
| jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader(templates_path)) | ||
|
|
||
| for fname in get_source_files(source_path): | ||
| if os.path.normpath(fname) in context["main"]["ignore"]: | ||
| if str(pathlib.Path(fname)) in context["main"]["ignore"]: |
There was a problem hiding this comment.
I think there is an attribute for that, right?
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.
Replaces
os.pathwithpathlib.Pathinpandas_web.py, as suggested by @datapythonista in 61578. No functional changes, verified site generation remains correct