gh-137165: Add non-zero-padded Windows support for datetime.strftime

Author: marat

Lib/_pydatetime.py

@@ -213,6 +213,11 @@ def _need_normalize_century():
             _normalize_century = True
     return _normalize_century
 
+def _make_dash_replacement(ch, timetuple):
+    fmt = '%' + ch
+    val = _time.strftime(fmt, timetuple)
+    return val.lstrip('0') or '0'
+
 # Correctly substitute for %z and %Z escapes in strftime formats.
 def _wrap_strftime(object, format, timetuple):
     # Don't call utcoffset() or tzname() unless actually needed.
@@ -284,6 +289,16 @@ def _wrap_strftime(object, format, timetuple):
                         push('{:04}'.format(year))
                         if ch == 'F':
                             push('-{:02}-{:02}'.format(*timetuple[1:3]))
+                elif ch == '-':
+                    if i < n:
+                        next_ch = format[i]
+                        i += 1
+                        if sys.platform.startswith('win') or sys.platform.startswith('android'):
+                            push(_make_dash_replacement(next_ch, timetuple))
+                        else:
+                            push('%-' + next_ch)
+                    else:
+                        push('%-')
                 else:
                     push('%')
                     push(ch)

Lib/test/datetimetester.py

@@ -14,6 +14,7 @@
 import textwrap
 import unittest
 import warnings
+import platform
 
 from array import array
 
@@ -1588,6 +1589,15 @@ def test_strftime(self):
         self.assertEqual(t.strftime(""), "") # SF bug #761337
         self.assertEqual(t.strftime('x'*1000), 'x'*1000) # SF bug #1556784
 
+        # SF bug #137165
+        if platform.system() == 'Darwin':
+            self.assertEqual(t.strftime("m:%-m d:%-d y:%-y"), "m:3 d:2 y:05")
+        elif platform.system() == 'Windows':
+            self.assertEqual(t.strftime("m:%#m d:%#d y:%#y"), "m:3 d:2 y:5")
+            self.assertEqual(t.strftime("m:%-m d:%-d y:%-y"), "m:3 d:2 y:5")
+        else:
+            self.assertEqual(t.strftime("m:%-m d:%-d y:%-y"), "m:3 d:2 y:5")
+
         self.assertRaises(TypeError, t.strftime) # needs an arg
         self.assertRaises(TypeError, t.strftime, "one", "two") # too many args
         self.assertRaises(TypeError, t.strftime, 42) # arg wrong type
@@ -3890,6 +3900,11 @@ def test_strftime(self):
         # A naive object replaces %z, %:z and %Z with empty strings.
         self.assertEqual(t.strftime("'%z' '%:z' '%Z'"), "'' '' ''")
 
+        # SF bug #137165
+        self.assertEqual(t.strftime('%-H %-M %-S %f'), "1 2 3 000004")
+        if platform.system() == 'Windows':
+            self.assertEqual(t.strftime('%#H %#M %#S %f'), "1 2 3 000004")
+
         # bpo-34482: Check that surrogates don't cause a crash.
         try:
             t.strftime('%H\ud800%M')

Misc/NEWS.d/next/Library/2025-09-16-15-36-18.gh-issue-137165.AclPcn.rst

@@ -0,0 +1,2 @@
+Add support for Windows non-zero-padded formatting directives in
+:func:`datetime.datetime.strftime` (e.g., ``"m:%-m d:%-d y:%-y"``).

Modules/_datetimemodule.c

@@ -2002,6 +2002,21 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
             }
             continue;
         }
+        #if defined(MS_WINDOWS) || defined(__ANDROID__)
+        /* non-0-pad Windows support */
+        else if (ch == '-' && i < flen) {
+            Py_UCS4 next_ch = PyUnicode_READ_CHAR(format, i);
+            if (strchr("dHImMSUwWyY", next_ch) != NULL) {
+                i++;
+                replacement = PyUnicode_FromFormat("%s%c", "%#", next_ch);
+                if (replacement == NULL) {
+                    goto Error;
+                }
+            } else {
+                continue;
+            }
+        }
+        #endif
         else {
             /* percent followed by something else */
             continue;