mirror of
https://github.com/python/cpython
synced 2024-09-22 07:21:31 +00:00
3dbca81c9b
svn+ssh://pythondev@svn.python.org/python/trunk ........ r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines Apply patch for issue 3090: ARCHFLAGS parsing incorrect ........ r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines #3045: fix pydoc behavior for TEMP path with spaces. ........ r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines #1608818: errno can get set by every call to readdir(). ........ r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines #3305: self->stream can be NULL. ........ r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines #3345: fix docstring. ........ r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines #3312: fix two sqlite3 crashes. ........ r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines #3388: add a paragraph about using "with" for file objects. ........ r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines news note for r63052 ........ r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines Fix issue 3395, update _debugInfo to be _debug_info ........ r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines Last bit of a fix for issue3381 (addon for my patch in r65061) ........ r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines Remove duplicate entry in __all__. ........ r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines Correct attribute name. ........ r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines Document the different meaning of precision for {:f} and {:g}. Also document how inf and nan are formatted. #3404. ........ r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line Improve accuracy of gamma test function ........ r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line Add recipe to the itertools docs. ........ r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines #3378: in case of no memory, don't leak even more memory. :) ........ r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines #3302: fix segfaults when passing None for arguments that can't be NULL for the C functions. ........ r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines #3303: fix crash with invalid Py_DECREF in strcoll(). ........ r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines #3319: don't raise ZeroDivisionError if number of rounds is so low that benchtime is zero. ........ r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines #3323: mention that if inheriting from a class without __slots__, the subclass will have a __dict__ available too. ........ r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines Add ordering info for findall and finditer. ........ r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line Fix compress() recipe in docs to use itertools. ........ r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line Clean-up itertools docs and recipes. ........ r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines fix issue3120 - don't truncate handles on 64-bit Windows. This is still messy, realistically PC/_subprocess.c should never cast pointers to python numbers and back at all. I don't have a 64-bit windows build environment because microsoft apparently thinks that should cost money. Time to watch the buildbots. It builds and passes tests on 32-bit windows. ........ r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines #926501: add info where to put the docstring. ........ r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line Fix a couple of names in error messages that were wrong ........ r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line Fix misspeeld method name (negative) ........ r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines Increment version number in NEWS file, and move items that were added after 2.6b2. (I thought there was a script to automate this kind of updates) ........ r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines Issue2378: pdb would delete free variables when stepping into a class statement. The problem was introduced by r53954, the correction is to restore the symmetry between PyFrame_FastToLocals and PyFrame_LocalsToFast ........ r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line don't use assert statement ........ r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines Fix buglet in fix for issue3381 ........ r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines Fix build issue on OSX 10.4, somehow this wasn't committed before. ........ r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line Remove out-of-date section on Exact/Inexact. ........ r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line Tuples now have both count() and index(). ........ r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line Fix credits for math.sum() ........ r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line One more attribution. ........ r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line remove unneeded import ........ r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line use isinstance ........
90 lines
3.4 KiB
Python
90 lines
3.4 KiB
Python
from test.support import verbose, TestSkipped, TestFailed
|
|
import locale
|
|
import sys
|
|
|
|
if sys.platform == 'darwin':
|
|
raise TestSkipped(
|
|
"Locale support on MacOSX is minimal and cannot be tested")
|
|
oldlocale = locale.setlocale(locale.LC_NUMERIC)
|
|
|
|
if sys.platform.startswith("win"):
|
|
tlocs = ("En", "English")
|
|
else:
|
|
tlocs = ("en_US.UTF-8", "en_US.US-ASCII", "en_US")
|
|
|
|
for tloc in tlocs:
|
|
try:
|
|
locale.setlocale(locale.LC_NUMERIC, tloc)
|
|
break
|
|
except locale.Error:
|
|
continue
|
|
else:
|
|
raise ImportError(
|
|
"test locale not supported (tried %s)" % (', '.join(tlocs)))
|
|
|
|
def testformat(formatstr, value, grouping = 0, output=None, func=locale.format):
|
|
if verbose:
|
|
if output:
|
|
print("%s %% %s =? %s ..." %
|
|
(repr(formatstr), repr(value), repr(output)), end=' ')
|
|
else:
|
|
print("%s %% %s works? ..." % (repr(formatstr), repr(value)),
|
|
end=' ')
|
|
result = func(formatstr, value, grouping = grouping)
|
|
if output and result != output:
|
|
if verbose:
|
|
print('no')
|
|
print("%s %% %s == %s != %s" %
|
|
(repr(formatstr), repr(value), repr(result), repr(output)))
|
|
else:
|
|
if verbose:
|
|
print("yes")
|
|
|
|
try:
|
|
# On Solaris 10, the thousands_sep is the empty string
|
|
sep = locale.localeconv()['thousands_sep']
|
|
testformat("%f", 1024, grouping=1, output='1%s024.000000' % sep)
|
|
testformat("%f", 102, grouping=1, output='102.000000')
|
|
testformat("%f", -42, grouping=1, output='-42.000000')
|
|
testformat("%+f", -42, grouping=1, output='-42.000000')
|
|
testformat("%20.f", -42, grouping=1, output=' -42')
|
|
testformat("%+10.f", -4200, grouping=1, output=' -4%s200' % sep)
|
|
testformat("%-10.f", 4200, grouping=1, output='4%s200 ' % sep)
|
|
# Invoke getpreferredencoding to make sure it does not cause exceptions,
|
|
locale.getpreferredencoding()
|
|
|
|
# === Test format() with more complex formatting strings
|
|
# test if grouping is independent from other characters in formatting string
|
|
testformat("One million is %i", 1000000, grouping=1,
|
|
output='One million is 1%s000%s000' % (sep, sep),
|
|
func=locale.format_string)
|
|
testformat("One million is %i", 1000000, grouping=1,
|
|
output='One million is 1%s000%s000' % (sep, sep),
|
|
func=locale.format_string)
|
|
# test dots in formatting string
|
|
testformat(".%f.", 1000.0, output='.1000.000000.', func=locale.format_string)
|
|
# test floats
|
|
testformat("--> %10.2f", 1000.0, grouping=1, output='--> 1%s000.00' % sep,
|
|
func=locale.format_string)
|
|
# test asterisk formats
|
|
testformat("%10.*f", (2, 1000.0), grouping=0, output=' 1000.00',
|
|
func=locale.format_string)
|
|
testformat("%*.*f", (10, 2, 1000.0), grouping=1, output=' 1%s000.00' % sep,
|
|
func=locale.format_string)
|
|
# test more-in-one
|
|
testformat("int %i float %.2f str %s", (1000, 1000.0, 'str'), grouping=1,
|
|
output='int 1%s000 float 1%s000.00 str str' % (sep, sep),
|
|
func=locale.format_string)
|
|
|
|
finally:
|
|
locale.setlocale(locale.LC_NUMERIC, oldlocale)
|
|
|
|
if hasattr(locale, "strcoll"):
|
|
# test crasher from bug #3303
|
|
try:
|
|
locale.strcoll("a", None)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed("TypeError not raised")
|