@@ -48,9 +48,8 @@ def melt(
48
48
missing = Index (np .ravel (id_vars )).difference (cols )
49
49
if not missing .empty :
50
50
raise KeyError (
51
- "The following 'id_vars' are not present"
52
- " in the DataFrame: {missing}"
53
- "" .format (missing = list (missing ))
51
+ f"The following 'id_vars' are not present"
52
+ f" in the DataFrame: { list (missing )} "
54
53
)
55
54
else :
56
55
id_vars = []
@@ -70,9 +69,8 @@ def melt(
70
69
missing = Index (np .ravel (value_vars )).difference (cols )
71
70
if not missing .empty :
72
71
raise KeyError (
73
- "The following 'value_vars' are not present in"
74
- " the DataFrame: {missing}"
75
- "" .format (missing = list (missing ))
72
+ f"The following 'value_vars' are not present in"
73
+ f" the DataFrame: { list (missing )} "
76
74
)
77
75
frame = frame .loc [:, id_vars + value_vars ]
78
76
else :
@@ -87,9 +85,7 @@ def melt(
87
85
if len (frame .columns .names ) == len (set (frame .columns .names )):
88
86
var_name = frame .columns .names
89
87
else :
90
- var_name = [
91
- "variable_{i}" .format (i = i ) for i in range (len (frame .columns .names ))
92
- ]
88
+ var_name = [f"variable_{ i } " for i in range (len (frame .columns .names ))]
93
89
else :
94
90
var_name = [
95
91
frame .columns .name if frame .columns .name is not None else "variable"
@@ -413,9 +409,7 @@ def wide_to_long(df, stubnames, i, j, sep: str = "", suffix: str = r"\d+"):
413
409
"""
414
410
415
411
def get_var_names (df , stub , sep , suffix ):
416
- regex = r"^{stub}{sep}{suffix}$" .format (
417
- stub = re .escape (stub ), sep = re .escape (sep ), suffix = suffix
418
- )
412
+ regex = fr"^{ re .escape (stub )} { re .escape (sep )} { suffix } $"
419
413
pattern = re .compile (regex )
420
414
return [col for col in df .columns if pattern .match (col )]
421
415
0 commit comments