python-utils 4.1.0__py3-none-any.whl → 4.1.1__py3-none-any.whl

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())

{python_utils-4.1.0.dist-info → python_utils-4.1.1.dist-info}/METADATA

@@ -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.dist-info → python_utils-4.1.1.dist-info}/RECORD

@@ -6,7 +6,7 @@ python_utils/containers.py,sha256=kHpDgj_sAdoouL0b_CE6IHSd-qtz0KYMs_Nuiba-yEQ,37
 python_utils/converters.py,sha256=gBOjkVYGwx1aBs7OtjFrMdQgZwI6wbOU_Rvy0u9OVFE,17273
 python_utils/decorators.py,sha256=UyVuV7Phf8kjAt38uA-F9MFH2o8zM4t-fmlgt3KL5cc,8225
 python_utils/exceptions.py,sha256=B5wljs3Id6eQ9eRaur-ZMPGGmhHNwh9F08Sfw6fuLX4,1230
-python_utils/formatters.py,sha256=OQo-dgtKLG76OMc72jXVMA7x1N1l8h8C025G9TwgZAc,6248
+python_utils/formatters.py,sha256=TgnSRHjfC9TKMp5lNUOlwDNBhFOtIaS-lOFpBcsMaEc,6611
 python_utils/generators.py,sha256=5X2mbjkEWl69syOHTxUaQS18ILZ49n2EvXb4cASVjxg,6151
 python_utils/import_.py,sha256=EnVSLs7Sk1CHrkpiKdXe8i-O6XjS5hXINpjdEohRT4A,5541
 python_utils/logger.py,sha256=-QuF7Zfo7pxc4nTmAPc9Pm-oz5wsxXIX7NeCnYEPI6I,14043
@@ -15,7 +15,7 @@ python_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_utils/terminal.py,sha256=GL3n2_rT98LBNmxy-amY-hezGKStCo-9_d_pR-TMgv8,6823
 python_utils/time.py,sha256=fZz00bpTeLXFFhbAo03LiMLWuzSJU4iPbyGSe7PYshU,16979
 python_utils/types.py,sha256=N1O2uFE2IuwVJk_vcwz8XNkf-taL-vJ5iNNG6FUXjTg,4336
-python_utils-4.1.0.dist-info/licenses/LICENSE,sha256=_Zrs9NZu-G6_aZT2g3Jv5_JREJQfhRNBC61EH6WDH-o,1501
-python_utils-4.1.0.dist-info/WHEEL,sha256=rp-k_VZaX8oABFEtLwG_Df95p8LSKt9-uPyQ4jKH0P4,81
-python_utils-4.1.0.dist-info/METADATA,sha256=H9vBD5TFJQLYKsZSY1GlK_qwb5IUELI_aWRR4v28rGE,15988
-python_utils-4.1.0.dist-info/RECORD,,
+python_utils-4.1.1.dist-info/licenses/LICENSE,sha256=_Zrs9NZu-G6_aZT2g3Jv5_JREJQfhRNBC61EH6WDH-o,1501
+python_utils-4.1.1.dist-info/WHEEL,sha256=xTCBFIZIIyRSxyowOv5Wqg_jFU6KsdIffuulBB09Ph8,80
+python_utils-4.1.1.dist-info/METADATA,sha256=LObK8d9NeYLUJN3Jpi3EyfXgIR7KSrSn0z5rJm5Ew7M,15988
+python_utils-4.1.1.dist-info/RECORD,,

{python_utils-4.1.0.dist-info → python_utils-4.1.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.12.22
+Generator: uv 0.13.0
 Root-Is-Purelib: true
 Tag: py3-none-any