Skip to content

pandas/core/strings/accesory.py Unnecessary dict call - rewrite as a literal #38138 #38280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 4, 2020
Merged

pandas/core/strings/accesory.py Unnecessary dict call - rewrite as a literal #38138 #38280

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ea6b0bb
Fix unnecesary dic call pandas/core/strings/accesory.py #38138
UrielMaD Dec 4, 2020
aeba238
Fix unnecesary dic call pandas/core/strings/accesory.py #38138
UrielMaD Dec 4, 2020
098c8ea
Merge branch 'master' of https://github.com/pandas-dev/pandas into fi…
UrielMaD Dec 4, 2020
0a7b4e9
Merge branch 'fix-dict-call' of https://github.com/UrielMaD/pandas in…
UrielMaD Dec 4, 2020
5fb3441
Merge branch 'fix-dict-call' of https://github.com/UrielMaD/pandas in…
UrielMaD Dec 4, 2020
1b904c4
Merge branch 'fix-dict-call' of https://github.com/UrielMaD/pandas in…
UrielMaD Dec 4, 2020
6d10648
Merge branch 'fix-dict-call' of https://github.com/UrielMaD/pandas in…
UrielMaD Dec 4, 2020
2bf491e
Merge branch 'fix-dict-call' of https://github.com/UrielMaD/pandas in…
UrielMaD Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 60 additions & 52 deletions pandas/core/strings/accessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

from pandas.core.base import NoNewAttributesMixin

_shared_docs: Dict[str, str] = dict()
_shared_docs: Dict[str, str] = {}
_cpython_optimized_encoders = (
"utf-8",
"utf8",
Expand Down Expand Up @@ -1446,17 +1446,17 @@ def pad(self, width, side="left", fillchar=" "):
filled : Series/Index of objects.
"""

@Appender(_shared_docs["str_pad"] % dict(side="left and right", method="center"))
@Appender(_shared_docs["str_pad"] % {"side": "left and right", "method": "center"})
@forbid_nonstring_types(["bytes"])
def center(self, width, fillchar=" "):
return self.pad(width, side="both", fillchar=fillchar)

@Appender(_shared_docs["str_pad"] % dict(side="right", method="ljust"))
@Appender(_shared_docs["str_pad"] % {"side": "right", "method": "ljust"})
@forbid_nonstring_types(["bytes"])
def ljust(self, width, fillchar=" "):
return self.pad(width, side="right", fillchar=fillchar)

@Appender(_shared_docs["str_pad"] % dict(side="left", method="rjust"))
@Appender(_shared_docs["str_pad"] % {"side": "left", "method": "rjust"})
@forbid_nonstring_types(["bytes"])
def rjust(self, width, fillchar=" "):
return self.pad(width, side="left", fillchar=fillchar)
Expand Down Expand Up @@ -1790,9 +1790,11 @@ def encode(self, encoding, errors="strict"):

@Appender(
_shared_docs["str_strip"]
% dict(
side="left and right sides", method="strip", position="leading and trailing"
)
% {
"side": "left and right sides",
"method": "strip",
"position": "leading and trailing",
}
)
@forbid_nonstring_types(["bytes"])
def strip(self, to_strip=None):
Expand All @@ -1801,7 +1803,7 @@ def strip(self, to_strip=None):

@Appender(
_shared_docs["str_strip"]
% dict(side="left side", method="lstrip", position="leading")
% {"side": "left side", "method": "lstrip", "position": "leading"}
)
@forbid_nonstring_types(["bytes"])
def lstrip(self, to_strip=None):
Expand All @@ -1810,7 +1812,7 @@ def lstrip(self, to_strip=None):

@Appender(
_shared_docs["str_strip"]
% dict(side="right side", method="rstrip", position="trailing")
% {"side": "right side", "method": "rstrip", "position": "trailing"}
)
@forbid_nonstring_types(["bytes"])
def rstrip(self, to_strip=None):
Expand Down Expand Up @@ -2412,11 +2414,11 @@ def extractall(self, pat, flags=0):

@Appender(
_shared_docs["find"]
% dict(
side="lowest",
method="find",
also="rfind : Return highest indexes in each strings.",
)
% {
"side": "lowest",
"method": "find",
"also": "rfind : Return highest indexes in each strings.",
}
)
@forbid_nonstring_types(["bytes"])
def find(self, sub, start=0, end=None):
Expand All @@ -2429,11 +2431,11 @@ def find(self, sub, start=0, end=None):

@Appender(
_shared_docs["find"]
% dict(
side="highest",
method="rfind",
also="find : Return lowest indexes in each strings.",
)
% {
"side": "highest",
"method": "rfind",
"also": "find : Return lowest indexes in each strings.",
}
)
@forbid_nonstring_types(["bytes"])
def rfind(self, sub, start=0, end=None):
Expand Down Expand Up @@ -2495,12 +2497,12 @@ def normalize(self, form):

@Appender(
_shared_docs["index"]
% dict(
side="lowest",
similar="find",
method="index",
also="rindex : Return highest indexes in each strings.",
)
% {
"side": "lowest",
"similar": "find",
"method": "index",
"also": "rindex : Return highest indexes in each strings.",
}
)
@forbid_nonstring_types(["bytes"])
def index(self, sub, start=0, end=None):
Expand All @@ -2513,12 +2515,12 @@ def index(self, sub, start=0, end=None):

@Appender(
_shared_docs["index"]
% dict(
side="highest",
similar="rfind",
method="rindex",
also="index : Return lowest indexes in each strings.",
)
% {
"side": "highest",
"similar": "rfind",
"method": "rindex",
"also": "index : Return lowest indexes in each strings.",
}
)
@forbid_nonstring_types(["bytes"])
def rindex(self, sub, start=0, end=None):
Expand Down Expand Up @@ -2653,18 +2655,24 @@ def len(self):
# isalpha, isnumeric isalnum isdigit isdecimal isspace islower isupper istitle
# _doc_args holds dict of strings to use in substituting casemethod docs
_doc_args: Dict[str, Dict[str, str]] = {}
_doc_args["lower"] = dict(type="lowercase", method="lower", version="")
_doc_args["upper"] = dict(type="uppercase", method="upper", version="")
_doc_args["title"] = dict(type="titlecase", method="title", version="")
_doc_args["capitalize"] = dict(
type="be capitalized", method="capitalize", version=""
)
_doc_args["swapcase"] = dict(type="be swapcased", method="swapcase", version="")
_doc_args["casefold"] = dict(
type="be casefolded",
method="casefold",
version="\n .. versionadded:: 0.25.0\n",
)
_doc_args["lower"] = {"type": "lowercase", "method": "lower", "version": ""}
_doc_args["upper"] = {"type": "uppercase", "method": "upper", "version": ""}
_doc_args["title"] = {"type": "titlecase", "method": "title", "version": ""}
_doc_args["capitalize"] = {
"type": "be capitalized",
"method": "capitalize",
"version": "",
}
_doc_args["swapcase"] = {
"type": "be swapcased",
"method": "swapcase",
"version": "",
}
_doc_args["casefold"] = {
"type": "be casefolded",
"method": "casefold",
"version": "\n .. versionadded:: 0.25.0\n",
}

@Appender(_shared_docs["casemethods"] % _doc_args["lower"])
@forbid_nonstring_types(["bytes"])
Expand Down Expand Up @@ -2844,15 +2852,15 @@ def casefold(self):
3 False
dtype: bool
"""
_doc_args["isalnum"] = dict(type="alphanumeric", method="isalnum")
_doc_args["isalpha"] = dict(type="alphabetic", method="isalpha")
_doc_args["isdigit"] = dict(type="digits", method="isdigit")
_doc_args["isspace"] = dict(type="whitespace", method="isspace")
_doc_args["islower"] = dict(type="lowercase", method="islower")
_doc_args["isupper"] = dict(type="uppercase", method="isupper")
_doc_args["istitle"] = dict(type="titlecase", method="istitle")
_doc_args["isnumeric"] = dict(type="numeric", method="isnumeric")
_doc_args["isdecimal"] = dict(type="decimal", method="isdecimal")
_doc_args["isalnum"] = {"type": "alphanumeric", "method": "isalnum"}
_doc_args["isalpha"] = {"type": "alphabetic", "method": "isalpha"}
_doc_args["isdigit"] = {"type": "digits", "method": "isdigit"}
_doc_args["isspace"] = {"type": "whitespace", "method": "isspace"}
_doc_args["islower"] = {"type": "lowercase", "method": "islower"}
_doc_args["isupper"] = {"type": "uppercase", "method": "isupper"}
_doc_args["istitle"] = {"type": "titlecase", "method": "istitle"}
_doc_args["isnumeric"] = {"type": "numeric", "method": "isnumeric"}
_doc_args["isdecimal"] = {"type": "decimal", "method": "isdecimal"}
# force _noarg_wrapper return type with dtype=np.dtype(bool) (GH 29624)

isalnum = _map_and_wrap(
Expand Down