#13579: minimize code base drift for 'a' string.Formatter change.
2.7 doesn't support 'a'. This changeset ports the doc change
and clause-reording portions of Francisco Martín Brugué patch
in order to minimize code base drift.
diff --git a/Lib/string.py b/Lib/string.py
index 9c0ebe1..9727803 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -601,12 +601,12 @@
def convert_field(self, value, conversion):
# do any conversion on the resulting object
- if conversion == 'r':
- return repr(value)
+ if conversion is None:
+ return value
elif conversion == 's':
return str(value)
- elif conversion is None:
- return value
+ elif conversion == 'r':
+ return repr(value)
raise ValueError("Unknown conversion specifier {0!s}".format(conversion))