python-utils 4.1.0__tar.gz → 4.1.1__tar.gz

{python_utils-4.1.0 → python_utils-4.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-utils
-Version: 4.1.0
+Version: 4.1.1
 Summary: Python Utils is a module with some convenient utilities not included with the standard Python install
 Keywords: utils,utilities,helpers,typing,typed,async,lazy-imports
 Author: Rick van Hattem

{python_utils-4.1.0 → python_utils-4.1.1}/_python_utils_tests/test_formatters.py

@@ -73,6 +73,44 @@ def test_camel_to_underscore_keeps_acronyms_whole(
     assert formatters.camel_to_underscore(name) == expected
 
 
+@pytest.mark.parametrize(
+    ('name', 'expected'),
+    [
+        ('ABc', 'a_bc'),
+        ('ABCd', 'ab_cd'),
+        ('IPad', 'i_pad'),
+        ('AName', 'a_name'),
+        ('__ABc__', '__a_bc__'),
+        ('XMLParser', 'xml_parser'),
+    ],
+)
+def test_camel_to_underscore_splits_short_acronym_boundary(
+    name: str, expected: str
+) -> None:
+    """Keep the final capital with the word following even a short acronym."""
+    assert formatters.camel_to_underscore(name) == expected
+
+
+@pytest.mark.parametrize(
+    ('name', 'expected'),
+    [
+        ('IDs', 'ids'),
+        ('URLs', 'urls'),
+        ('UserIDs', 'user_ids'),
+        ('GetURLs', 'get_urls'),
+        ('IDsAndNames', 'ids_and_names'),
+        ('PDFs_v2', 'pdfs_v2'),
+        ('ISpam', 'i_spam'),
+        ('IPsec', 'i_psec'),
+    ],
+)
+def test_camel_to_underscore_keeps_plural_acronyms_whole(
+    name: str, expected: str
+) -> None:
+    """Keep a plural ``s`` that ends a word with the acronym before it."""
+    assert formatters.camel_to_underscore(name) == expected
+
+
 def test_timesince_date_raises_type_error() -> None:
     """Keep raising ``TypeError`` for a date, which has no time."""
     today: typing.Any = datetime.date.today()

{python_utils-4.1.0 → python_utils-4.1.1}/pyproject.toml

@@ -125,7 +125,7 @@ source-include = [
 
 [project]
 name = "python-utils"
-version = "4.1.0"
+version = "4.1.1"
 description = "Python Utils is a module with some convenient utilities not included with the standard Python install"
 readme = "README.md"
 requires-python = ">=3.10"

{python_utils-4.1.0 → python_utils-4.1.1}/pyproject.toml.orig

@@ -12,7 +12,7 @@ source-include = ['_python_utils_tests/**/*.py', 'conftest.py', 'tox.ini']
 
 [project]
 name = 'python-utils'
-version = "4.1.0" # static; the single source of truth. Bump via `uv version`.
+version = "4.1.1" # static; the single source of truth. Bump via `uv version`.
 description = 'Python Utils is a module with some convenient utilities not included with the standard Python install'
 readme = 'README.md'
 requires-python = '>=3.10'

{python_utils-4.1.0 → python_utils-4.1.1}/python_utils/formatters.py

@@ -21,7 +21,8 @@ def camel_to_underscore(name: str) -> str:
 
     If there are existing underscores they will be collapsed with the
     to-be-added underscores. Multiple consecutive capital letters will not be
-    split except for the last one.
+    split except for the last one. A plural ``s`` that ends a word stays with
+    the acronym before it.
 
     >>> camel_to_underscore('SpamEggsAndBacon')
     'spam_eggs_and_bacon'
@@ -42,12 +43,16 @@ def camel_to_underscore(name: str) -> str:
                 # Uppercase and the previous character isn't upper/underscore?
                 # Add the underscore
                 output.append('_')
-            elif i > 3 and c.islower():
-                # Will return the last 3 letters to check if we are changing
-                # case. Only a lowercase letter ends an acronym, an underscore
-                # or a digit after it leaves the acronym whole.
-                previous = name[i - 3 : i]
-                if previous.isalpha() and previous.isupper():
+            elif i > 1 and c.islower():
+                # Two preceding capitals are enough to mark the boundary:
+                # the final capital belongs to the following word. Only a
+                # lowercase letter ends an acronym; an underscore or digit
+                # after it leaves the acronym whole.
+                previous = name[i - 2 : i]
+                # A lone ``s`` that ends the word makes the acronym plural
+                # (``IDs``, ``URLs``) and does not start a new word.
+                plural: bool = c == 's' and not name[i + 1 : i + 2].islower()
+                if previous.isalpha() and previous.isupper() and not plural:
                     output.insert(len(output) - 1, '_')
 
         output.append(c.lower())