commit c16a2a1b643d3e04f86780e2c9e66c3f9f322560
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Tue Sep 01 08:45:59 2020 -0700
committer GitHub <noreply@github.com> Tue Sep 01 11:45:59 2020 -0400
tree 8d707bcefac61faf87fd7fd23a998c86421dba20
parent ca55ecbf9aab305fa301ec69410ca3d3d18ec848

bpo-41681: Fix for `f-string/str.format` error description when using 2 `,` in format specifier (GH-22036) (GH-22041)

* Fixed `f-string/str.format` error description when using two `,` in format specifier.

Co-authored-by: millefalcon <hanish0019@hmail.com>
(cherry picked from commit 0d6aa7f0ee38eb453bc8f73bf4830e6172be2f35)

Co-authored-by: han-solo <hanish0019@gmail.com>

Co-authored-by: han-solo <hanish0019@gmail.com>

Python/formatter_unicode.c

diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index 74638ca..ed95f26 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -252,8 +252,10 @@
         ++pos;
     }
     if (end-pos && READ_spec(pos) == ',') {
-        invalid_comma_and_underscore();
-        return 0;
+        if (format->thousands_separators == LT_UNDERSCORE_LOCALE) {
+            invalid_comma_and_underscore();
+            return 0;
+        }
     }
 
     /* Parse field precision */