Skip to content

Commit 681a9d0

Browse files
committed
Cover initials_separator/suffix_delimiter in autouse CONSTANTS restore
These scalar attributes were mutated directly by tests without being in _SCALAR_CONFIG_ATTRS, so the autouse fixture wasn't restoring them and tests relied on manual try/finally blocks instead. Adding them to the list lets us drop the now-redundant manual restoration.
1 parent 0a4fa03 commit 681a9d0

3 files changed

Lines changed: 15 additions & 31 deletions

File tree

tests/conftest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"string_format",
1717
"initials_format",
1818
"initials_delimiter",
19+
"initials_separator",
20+
"suffix_delimiter",
1921
"capitalize_name",
2022
"force_mixed_case_capitalization",
2123
)

tests/test_initials.py

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -53,28 +53,22 @@ def test_initials_format(self) -> None:
5353

5454
def test_initials_format_constants(self) -> None:
5555
from nameparser.config import CONSTANTS
56-
_orig = CONSTANTS.initials_format
5756
CONSTANTS.initials_format = "{first} {last}"
5857
hn = HumanName("Doe, John A. Kenneth, Jr.")
5958
self.m(hn.initials(), "J. D.", hn)
6059
CONSTANTS.initials_format = "{first} {last}"
6160
hn = HumanName("Doe, John A. Kenneth, Jr.")
6261
self.m(hn.initials(), "J. D.", hn)
63-
CONSTANTS.initials_format = _orig
6462

6563
def test_initials_delimiter(self) -> None:
6664
hn = HumanName("Doe, John A. Kenneth, Jr.", initials_delimiter=";")
6765
self.m(hn.initials(), "J; A; K; D;", hn)
6866

6967
def test_initials_delimiter_constants(self) -> None:
7068
from nameparser.config import CONSTANTS
71-
_orig = CONSTANTS.initials_delimiter
72-
try:
73-
CONSTANTS.initials_delimiter = ";"
74-
hn = HumanName("Doe, John A. Kenneth, Jr.")
75-
self.m(hn.initials(), "J; A; K; D;", hn)
76-
finally:
77-
CONSTANTS.initials_delimiter = _orig
69+
CONSTANTS.initials_delimiter = ";"
70+
hn = HumanName("Doe, John A. Kenneth, Jr.")
71+
self.m(hn.initials(), "J; A; K; D;", hn)
7872

7973
def test_initials_separator_default_on_constants(self) -> None:
8074
from nameparser.config import CONSTANTS
@@ -197,16 +191,8 @@ def test_initials_separator_empty_multi_part_middle(self) -> None:
197191

198192
def test_initials_separator_constants_multi_part_middle(self) -> None:
199193
from nameparser.config import CONSTANTS
200-
_orig_d = CONSTANTS.initials_delimiter
201-
_orig_s = CONSTANTS.initials_separator
202-
_orig_f = CONSTANTS.initials_format
203-
try:
204-
CONSTANTS.initials_delimiter = ""
205-
CONSTANTS.initials_separator = ""
206-
CONSTANTS.initials_format = "{first}{middle}{last}"
207-
hn = HumanName("Doe, John A. Kenneth")
208-
self.m(hn.initials(), "JAKD", hn)
209-
finally:
210-
CONSTANTS.initials_delimiter = _orig_d
211-
CONSTANTS.initials_separator = _orig_s
212-
CONSTANTS.initials_format = _orig_f
194+
CONSTANTS.initials_delimiter = ""
195+
CONSTANTS.initials_separator = ""
196+
CONSTANTS.initials_format = "{first}{middle}{last}"
197+
hn = HumanName("Doe, John A. Kenneth")
198+
self.m(hn.initials(), "JAKD", hn)

tests/test_suffixes.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,11 @@ def test_suffix_delimiter_no_effect_without_comma(self) -> None:
238238

239239
def test_suffix_delimiter_constants_level(self) -> None:
240240
from nameparser.config import CONSTANTS
241-
_orig = CONSTANTS.suffix_delimiter
242-
try:
243-
CONSTANTS.suffix_delimiter = " - "
244-
hn = HumanName("Steven Hardman, RN - CRNA")
245-
self.m(hn.first, "Steven", hn)
246-
self.m(hn.last, "Hardman", hn)
247-
self.m(hn.suffix, "RN, CRNA", hn)
248-
finally:
249-
CONSTANTS.suffix_delimiter = _orig
241+
CONSTANTS.suffix_delimiter = " - "
242+
hn = HumanName("Steven Hardman, RN - CRNA")
243+
self.m(hn.first, "Steven", hn)
244+
self.m(hn.last, "Hardman", hn)
245+
self.m(hn.suffix, "RN, CRNA", hn)
250246

251247
def test_suffix_delimiter_none_by_default_known_limitation(self) -> None:
252248
# Without suffix_delimiter set, " - " between suffixes breaks parsing.

0 commit comments

Comments
 (0)