Simplify multiple calls to str.startswith / str.endswith #1760
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
| @@ -361,9 +356,9 @@ def load_addon_file(path, callback=None): | |||
| return False | |||
| fptr.close() | |||
| # file_obj is either Zipfile or TarFile | |||
| if path.endswith(".zip") or path.endswith(".ZIP"): | |||
| if path.endswith((".zip", ".ZIP")): | |||
There was a problem hiding this comment.
Suggested change
| if path.endswith((".zip", ".ZIP")): | |
| if path.lower().endswith((".zip")): |
would this be ever clearer and handle mixed case (.Zip etc.) correctly as well?
| or path.startswith("ftp://") | ||
| or path.startswith("file://") | ||
| ): | ||
| if path.startswith(("http://", "https://", "ftp://", "file://")): |
There was a problem hiding this comment.
Suggested change
| if path.startswith(("http://", "https://", "ftp://", "file://")): | |
| if path.lower().startswith(("http://", "https://", "ftp://", "file://")): |
The protocol in a URI is case-insensitive. See https://www.rfc-editor.org/rfc/rfc3986#section-3.1
| file_obj = Zipfile(buffer) | ||
| elif path.endswith(".tar.gz") or path.endswith(".tgz"): | ||
| elif path.endswith((".tar.gz", ".tgz")): |
There was a problem hiding this comment.
Suggested change
| elif path.endswith((".tar.gz", ".tgz")): | |
| elif path.lower().endswith((".tar.gz", ".tgz")): |
| or url.endswith(".tar.gz") | ||
| or url.endswith(".tgz") | ||
| ): | ||
| if url.endswith((".zip", ".ZIP", ".tar.gz", ".tgz")): |
There was a problem hiding this comment.
Suggested change
| if url.endswith((".zip", ".ZIP", ".tar.gz", ".tgz")): | |
| if url.lower().endswith((".zip", ".ZIP", ".tar.gz", ".tgz")): |
| if not ( | ||
| uri.startswith("http://") or uri.startswith("https://") | ||
| ): | ||
| if not uri.startswith(("http://", "https://")): |
There was a problem hiding this comment.
Suggested change
| if not uri.startswith(("http://", "https://")): | |
| if not uri.lower().startswith(("http://", "https://")): |
| url = self.secure_mode | ||
| uri = url + "%(website)s" % {"website": uri} | ||
|
|
||
| # FTP server address | ||
| elif _type == UrlType.WEB_FTP: | ||
| if not (uri.startswith("ftp://") or uri.startswith("ftps://")): | ||
| if not uri.startswith(("ftp://", "ftps://")): |
There was a problem hiding this comment.
Suggested change
| if not uri.startswith(("ftp://", "ftps://")): | |
| if not uri.lower().startswith(("ftp://", "ftps://")): |
| @@ -280,8 +280,8 @@ def month_navigation(self, nr_up, year, currentsection): | |||
| url_fname = url_fname.lower() | |||
| url = url_fname | |||
| add_subdirs = False | |||
| if not (url.startswith("http:") or url.startswith("/")): | |||
| add_subdirs = not any(url.endswith(ext) for ext in _WEB_EXT) | |||
| if not url.startswith(("http:", "/")): | |||
There was a problem hiding this comment.
Suggested change
| if not url.startswith(("http:", "/")): | |
| if not url.lower().startswith(("http:", "/")): |
| @@ -708,7 +708,7 @@ def _has_webpage_extension(url): | |||
|
|
|||
| @param: url -- filename to be checked | |||
| """ | |||
| return any(url.endswith(ext) for ext in _WEB_EXT) | |||
| return url.endswith(_WEB_EXT) | |||
There was a problem hiding this comment.
Suggested change
| return url.endswith(_WEB_EXT) | |
| return url.lower().endswith(_WEB_EXT) |
| @@ -709,8 +709,8 @@ def month_navigation(self, nr_up, year, currentsection): | |||
| url_fname = url_fname.lower() | |||
| url = url_fname | |||
| add_subdirs = False | |||
| if not (url.startswith("http:") or url.startswith("/")): | |||
| add_subdirs = not any(url.endswith(ext) for ext in _WEB_EXT) | |||
| if not url.startswith(("http:", "/")): | |||
There was a problem hiding this comment.
Suggested change
| if not url.startswith(("http:", "/")): | |
| if not url.lower().startswith(("http:", "/")): |
| @@ -2238,7 +2238,7 @@ def _has_webpage_extension(url): | |||
|
|
|||
| url = filename to be checked | |||
| """ | |||
| return any(url.endswith(ext) for ext in _WEB_EXT) | |||
| return url.endswith(_WEB_EXT) | |||
There was a problem hiding this comment.
Suggested change
| return url.endswith(_WEB_EXT) | |
| return url.lower().endswith(_WEB_EXT) |
|
@QuLogic My suggestions to improve handling of case go beyond your original fix. Let me know if you would prefer me to submit a separate PR with these changes. |
These methods have supported tuples to mean "any of the prefixes / suffixes" since Python 2.5, which can greatly simplify a bunch of `or`'d conditions.
Nick-Hall
force-pushed
the
startswith-endswith
branch
from
fd8fc0e to
c3c30f5
Compare
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.
These methods have supported tuples to mean "any of the prefixes / suffixes" since Python 2.5, which can greatly simplify a bunch of
or'd conditions.