[pypy-svn] r76119 - pypy/branch/fast-forward/pypy/objspace/std

benjamin at codespeak.net benjamin at codespeak.net
Mon Jul 12 01:11:10 CEST 2010


Author: benjamin
Date: Mon Jul 12 01:11:09 2010
New Revision: 76119

Modified:
   pypy/branch/fast-forward/pypy/objspace/std/newformat.py
Log:
desugar max()

Modified: pypy/branch/fast-forward/pypy/objspace/std/newformat.py
==============================================================================
--- pypy/branch/fast-forward/pypy/objspace/std/newformat.py	(original)
+++ pypy/branch/fast-forward/pypy/objspace/std/newformat.py	Mon Jul 12 01:11:09 2010
@@ -541,7 +541,7 @@
                 previous = group
             else:
                 group = previous
-            final_grouping = min(group, max(left, min_width, 1))
+            final_grouping = min(group, max(left, max(min_width, 1)))
             n_zeros = max(0, final_grouping - left)
             n_chars = max(0, min(left, final_grouping))
             ts = self._loc_thousands if need_separator else None



More information about the Pypy-commit mailing list