Merged revisions 78333 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r78333 | eric.smith | 2010-02-22 13:54:44 -0500 (Mon, 22 Feb 2010) | 9 lines
Merged revisions 78329 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78329 | eric.smith | 2010-02-22 13:33:47 -0500 (Mon, 22 Feb 2010) | 1 line
Issue #7988: Fix default alignment to be right aligned for complex.__format__. Now it matches other numeric types.
........
................
diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h
index 5cead66..df07b11 100644
--- a/Objects/stringlib/formatter.h
+++ b/Objects/stringlib/formatter.h
@@ -123,6 +123,26 @@
STRINGLIB_CHAR type;
} InternalFormatSpec;
+
+#if 0
+/* Occassionally useful for debugging. Should normally be commented out. */
+static void
+DEBUG_PRINT_FORMAT_SPEC(InternalFormatSpec *format)
+{
+ printf("internal format spec: fill_char %d\n", format->fill_char);
+ printf("internal format spec: align %d\n", format->align);
+ printf("internal format spec: alternate %d\n", format->alternate);
+ printf("internal format spec: sign %d\n", format->sign);
+ printf("internal format spec: width %d\n", format->width);
+ printf("internal format spec: thousands_separators %d\n",
+ format->thousands_separators);
+ printf("internal format spec: precision %d\n", format->precision);
+ printf("internal format spec: type %c\n", format->type);
+ printf("\n");
+}
+#endif
+
+
/*
ptr points to the start of the format_spec, end points just past its end.
fills in format with the parsed information.
@@ -133,7 +153,8 @@
parse_internal_render_format_spec(STRINGLIB_CHAR *format_spec,
Py_ssize_t format_spec_len,
InternalFormatSpec *format,
- char default_type)
+ char default_type,
+ char default_align)
{
STRINGLIB_CHAR *ptr = format_spec;
STRINGLIB_CHAR *end = format_spec + format_spec_len;
@@ -144,7 +165,7 @@
Py_ssize_t consumed;
format->fill_char = '\0';
- format->align = '\0';
+ format->align = default_align;
format->alternate = 0;
format->sign = '\0';
format->width = -1;
@@ -279,14 +300,19 @@
*n_total = nchars;
}
- /* figure out how much leading space we need, based on the
+ /* Figure out how much leading space we need, based on the
aligning */
if (align == '>')
*n_lpadding = *n_total - nchars;
else if (align == '^')
*n_lpadding = (*n_total - nchars) / 2;
- else
+ else if (align == '<' || align == '=')
*n_lpadding = 0;
+ else {
+ /* We should never have an unspecified alignment. */
+ *n_lpadding = 0;
+ assert(0);
+ }
*n_rpadding = *n_total - nchars - *n_lpadding;
}
@@ -488,10 +514,14 @@
case '=':
spec->n_spadding = n_padding;
break;
- default:
- /* Handles '>', plus catch-all just in case. */
+ case '>':
spec->n_lpadding = n_padding;
break;
+ default:
+ /* Shouldn't get here, but treat it as '>' */
+ spec->n_lpadding = n_padding;
+ assert(0);
+ break;
}
}
return spec->n_lpadding + spec->n_sign + spec->n_prefix +
@@ -1193,7 +1223,7 @@
/* Turn off any padding. We'll do it later after we've composed
the numbers without padding. */
tmp_format.fill_char = '\0';
- tmp_format.align = '\0';
+ tmp_format.align = '<';
tmp_format.width = -1;
/* Calculate how much memory we'll need. */
@@ -1269,7 +1299,7 @@
/* parse the format_spec */
if (!parse_internal_render_format_spec(format_spec, format_spec_len,
- &format, 's'))
+ &format, 's', '<'))
goto done;
/* type conversion? */
@@ -1309,7 +1339,7 @@
/* parse the format_spec */
if (!parse_internal_render_format_spec(format_spec,
format_spec_len,
- &format, 'd'))
+ &format, 'd', '>'))
goto done;
/* type conversion? */
@@ -1420,7 +1450,7 @@
/* parse the format_spec */
if (!parse_internal_render_format_spec(format_spec,
format_spec_len,
- &format, '\0'))
+ &format, '\0', '>'))
goto done;
/* type conversion? */
@@ -1468,7 +1498,7 @@
/* parse the format_spec */
if (!parse_internal_render_format_spec(format_spec,
format_spec_len,
- &format, '\0'))
+ &format, '\0', '>'))
goto done;
/* type conversion? */