Skip to content

Commit 8b58334

Browse files
authored
CLN refactor non-core (#37580)
1 parent 4492979 commit 8b58334

File tree

6 files changed

+29
-37
lines changed

6 files changed

+29
-37
lines changed

pandas/_config/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ class option_context(ContextDecorator):
392392
"""
393393

394394
def __init__(self, *args):
395-
if not (len(args) % 2 == 0 and len(args) >= 2):
395+
if len(args) % 2 != 0 or len(args) < 2:
396396
raise ValueError(
397397
"Need to invoke as option_context(pat, val, [(pat, val), ...])."
398398
)
@@ -648,7 +648,7 @@ def _build_option_description(k: str) -> str:
648648
s += f"\n [default: {o.defval}] [currently: {_get_option(k, True)}]"
649649

650650
if d:
651-
rkey = d.rkey if d.rkey else ""
651+
rkey = d.rkey or ""
652652
s += "\n (Deprecated"
653653
s += f", use `{rkey}` instead."
654654
s += ")"

pandas/_config/localization.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ def _valid_locales(locales, normalize):
9999

100100

101101
def _default_locale_getter():
102-
raw_locales = subprocess.check_output(["locale -a"], shell=True)
103-
return raw_locales
102+
return subprocess.check_output(["locale -a"], shell=True)
104103

105104

106105
def get_locales(prefix=None, normalize=True, locale_getter=_default_locale_getter):

pandas/_testing.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -736,8 +736,7 @@ def _get_ilevel_values(index, level):
736736
unique = index.levels[level]
737737
level_codes = index.codes[level]
738738
filled = take_1d(unique._values, level_codes, fill_value=unique._na_value)
739-
values = unique._shallow_copy(filled, name=index.names[level])
740-
return values
739+
return unique._shallow_copy(filled, name=index.names[level])
741740

742741
if check_less_precise is not no_default:
743742
warnings.warn(
@@ -1885,8 +1884,7 @@ def makeTimedeltaIndex(k=10, freq="D", name=None, **kwargs):
18851884

18861885
def makePeriodIndex(k=10, name=None, **kwargs):
18871886
dt = datetime(2000, 1, 1)
1888-
dr = pd.period_range(start=dt, periods=k, freq="B", name=name, **kwargs)
1889-
return dr
1887+
return pd.period_range(start=dt, periods=k, freq="B", name=name, **kwargs)
18901888

18911889

18921890
def makeMultiIndex(k=10, names=None, **kwargs):
@@ -2525,9 +2523,12 @@ def network(
25252523

25262524
@wraps(t)
25272525
def wrapper(*args, **kwargs):
2528-
if check_before_test and not raise_on_error:
2529-
if not can_connect(url, error_classes):
2530-
skip()
2526+
if (
2527+
check_before_test
2528+
and not raise_on_error
2529+
and not can_connect(url, error_classes)
2530+
):
2531+
skip()
25312532
try:
25322533
return t(*args, **kwargs)
25332534
except Exception as err:
@@ -2942,8 +2943,7 @@ def convert_rows_list_to_csv_str(rows_list: List[str]):
29422943
Expected output of to_csv() in current OS.
29432944
"""
29442945
sep = os.linesep
2945-
expected = sep.join(rows_list) + sep
2946-
return expected
2946+
return sep.join(rows_list) + sep
29472947

29482948

29492949
def external_error_raised(expected_exception: Type[Exception]) -> ContextManager:

pandas/_version.py

+15-21
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ def get_keywords():
2222
# get_keywords().
2323
git_refnames = "$Format:%d$"
2424
git_full = "$Format:%H$"
25-
keywords = {"refnames": git_refnames, "full": git_full}
26-
return keywords
25+
return {"refnames": git_refnames, "full": git_full}
2726

2827

2928
class VersioneerConfig:
@@ -121,17 +120,16 @@ def git_get_keywords(versionfile_abs):
121120
# _version.py.
122121
keywords = {}
123122
try:
124-
f = open(versionfile_abs)
125-
for line in f.readlines():
126-
if line.strip().startswith("git_refnames ="):
127-
mo = re.search(r'=\s*"(.*)"', line)
128-
if mo:
129-
keywords["refnames"] = mo.group(1)
130-
if line.strip().startswith("git_full ="):
131-
mo = re.search(r'=\s*"(.*)"', line)
132-
if mo:
133-
keywords["full"] = mo.group(1)
134-
f.close()
123+
with open(versionfile_abs) as fd:
124+
for line in fd.readlines():
125+
if line.strip().startswith("git_refnames ="):
126+
mo = re.search(r'=\s*"(.*)"', line)
127+
if mo:
128+
keywords["refnames"] = mo.group(1)
129+
if line.strip().startswith("git_full ="):
130+
mo = re.search(r'=\s*"(.*)"', line)
131+
if mo:
132+
keywords["full"] = mo.group(1)
135133
except OSError:
136134
pass
137135
return keywords
@@ -286,13 +284,11 @@ def render_pep440(pieces):
286284
if pieces["distance"] or pieces["dirty"]:
287285
rendered += plus_or_dot(pieces)
288286
rendered += f"{pieces['distance']:d}.g{pieces['short']}"
289-
if pieces["dirty"]:
290-
rendered += ".dirty"
291287
else:
292288
# exception #1
293289
rendered = f"0+untagged.{pieces['distance']:d}.g{pieces['short']}"
294-
if pieces["dirty"]:
295-
rendered += ".dirty"
290+
if pieces["dirty"]:
291+
rendered += ".dirty"
296292
return rendered
297293

298294

@@ -348,13 +344,11 @@ def render_pep440_old(pieces):
348344
rendered = pieces["closest-tag"]
349345
if pieces["distance"] or pieces["dirty"]:
350346
rendered += f".post{pieces['distance']:d}"
351-
if pieces["dirty"]:
352-
rendered += ".dev0"
353347
else:
354348
# exception #1
355349
rendered = f"0.post{pieces['distance']:d}"
356-
if pieces["dirty"]:
357-
rendered += ".dev0"
350+
if pieces["dirty"]:
351+
rendered += ".dev0"
358352
return rendered
359353

360354

pandas/compat/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def is_platform_windows() -> bool:
5050
bool
5151
True if the running platform is windows.
5252
"""
53-
return sys.platform == "win32" or sys.platform == "cygwin"
53+
return sys.platform in ["win32", "cygwin"]
5454

5555

5656
def is_platform_linux() -> bool:

pandas/conftest.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,12 @@ def _create_multiindex():
386386
major_codes = np.array([0, 0, 1, 2, 3, 3])
387387
minor_codes = np.array([0, 1, 0, 1, 0, 1])
388388
index_names = ["first", "second"]
389-
mi = MultiIndex(
389+
return MultiIndex(
390390
levels=[major_axis, minor_axis],
391391
codes=[major_codes, minor_codes],
392392
names=index_names,
393393
verify_integrity=False,
394394
)
395-
return mi
396395

397396

398397
def _create_mi_with_dt64tz_level():

0 commit comments

Comments
 (0)