babel/mirror: babel/numbers.py annotate

annotate babel/numbers.py @ 375:4eca63af0a12 trunk

Implement support for aliases in the CLDR data. Closes #68. Also, update to CLDR 1.6, and a much improved `dump_data` script.

author	cmlenz
date	Mon, 07 Jul 2008 14:49:16 +0000
parents	ce1f9919f8c9
children	38db48990998

rev	line source
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	1 # -- coding: utf-8 --
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	2 #
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	3 # Copyright (C) 2007 Edgewall Software
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	4 # All rights reserved.
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	5 #
245 4a5083bc9c32 Revert accidential change of file header in [260]. cmlenz parents: 244 diff changeset	6 # This software is licensed as described in the file COPYING, which
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	7 # you should have received as part of this distribution. The terms
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	8 # are also available at http://babel.edgewall.org/wiki/License.
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	9 #
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	10 # This software consists of voluntary contributions made by many
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	11 # individuals. For the exact contribution history, see the revision
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	12 # history and logs, available at http://babel.edgewall.org/log/.
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	13
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	14 """Locale dependent formatting and parsing of numeric data.
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	15
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	16 The default locale for the functions in this module is determined by the
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	17 following environment variables, in that order:
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	18
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	19 * ``LC_NUMERIC``,
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	20 * ``LC_ALL``, and
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	21 * ``LANG``
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	22 """
246 b8390ebedc30 Updated TODO-items in number.py. jonas parents: 245 diff changeset	23 # TODO:
b8390ebedc30 Updated TODO-items in number.py. jonas parents: 245 diff changeset	24 # Padding and rounding increments in pattern:
b8390ebedc30 Updated TODO-items in number.py. jonas parents: 245 diff changeset	25 # - http://www.unicode.org/reports/tr35/ (Appendix G.6)
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	26 import math
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	27 import re
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	28 try:
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	29 from decimal import Decimal
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	30 have_decimal = True
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	31 except ImportError:
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	32 have_decimal = False
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	33
72 e0bb7dce49ea More explicit module-level function names in `babel.core`. Added `Locale.negotiate` class method. cmlenz parents: 50 diff changeset	34 from babel.core import default_locale, Locale
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	35
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	36 __all__ = ['format_number', 'format_decimal', 'format_currency',
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	37 'format_percent', 'format_scientific', 'parse_number',
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	38 'parse_decimal', 'NumberFormatError']
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	39 __docformat__ = 'restructuredtext en'
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	40
72 e0bb7dce49ea More explicit module-level function names in `babel.core`. Added `Locale.negotiate` class method. cmlenz parents: 50 diff changeset	41 LC_NUMERIC = default_locale('LC_NUMERIC')
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	42
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	43 def get_currency_symbol(currency, locale=LC_NUMERIC):
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	44 """Return the symbol used by the locale for the specified currency.
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	45
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	46 >>> get_currency_symbol('USD', 'en_US')
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	47 u'$'
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	48
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	49 :param currency: the currency code
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	50 :param locale: the `Locale` object or locale identifier
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	51 :return: the currency symbol
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	52 :rtype: `unicode`
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	53 """
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	54 return Locale.parse(locale).currency_symbols.get(currency, currency)
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	55
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	56 def get_decimal_symbol(locale=LC_NUMERIC):
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	57 """Return the symbol used by the locale to separate decimal fractions.
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	58
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	59 >>> get_decimal_symbol('en_US')
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	60 u'.'
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	61
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	62 :param locale: the `Locale` object or locale identifier
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	63 :return: the decimal symbol
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	64 :rtype: `unicode`
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	65 """
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	66 return Locale.parse(locale).number_symbols.get('decimal', u'.')
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	67
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	68 def get_plus_sign_symbol(locale=LC_NUMERIC):
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	69 """Return the plus sign symbol used by the current locale.
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	70
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	71 >>> get_plus_sign_symbol('en_US')
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	72 u'+'
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	73
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	74 :param locale: the `Locale` object or locale identifier
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	75 :return: the plus sign symbol
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	76 :rtype: `unicode`
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	77 """
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	78 return Locale.parse(locale).number_symbols.get('plusSign', u'+')
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	79
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	80 def get_minus_sign_symbol(locale=LC_NUMERIC):
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	81 """Return the plus sign symbol used by the current locale.
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	82
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	83 >>> get_minus_sign_symbol('en_US')
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	84 u'-'
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	85
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	86 :param locale: the `Locale` object or locale identifier
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	87 :return: the plus sign symbol
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	88 :rtype: `unicode`
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	89 """
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	90 return Locale.parse(locale).number_symbols.get('minusSign', u'-')
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	91
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	92 def get_exponential_symbol(locale=LC_NUMERIC):
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	93 """Return the symbol used by the locale to separate mantissa and exponent.
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	94
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	95 >>> get_exponential_symbol('en_US')
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	96 u'E'
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	97
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	98 :param locale: the `Locale` object or locale identifier
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	99 :return: the exponential symbol
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	100 :rtype: `unicode`
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	101 """
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	102 return Locale.parse(locale).number_symbols.get('exponential', u'E')
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	103
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	104 def get_group_symbol(locale=LC_NUMERIC):
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	105 """Return the symbol used by the locale to separate groups of thousands.
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	106
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	107 >>> get_group_symbol('en_US')
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	108 u','
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	109
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	110 :param locale: the `Locale` object or locale identifier
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	111 :return: the group symbol
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	112 :rtype: `unicode`
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	113 """
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	114 return Locale.parse(locale).number_symbols.get('group', u',')
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	115
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	116 def format_number(number, locale=LC_NUMERIC):
101 0f641136aa6b Add wrapper class bundling the various formatting functions bound to a specific locale and time-zone. cmlenz parents: 72 diff changeset	117 """Return the given number formatted for a specific locale.
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	118
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	119 >>> format_number(1099, locale='en_US')
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	120 u'1,099'
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	121
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	122 :param number: the number to format
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	123 :param locale: the `Locale` object or locale identifier
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	124 :return: the formatted number
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	125 :rtype: `unicode`
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	126 """
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	127 # Do we really need this one?
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	128 return format_decimal(number, locale=locale)
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	129
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	130 def format_decimal(number, format=None, locale=LC_NUMERIC):
101 0f641136aa6b Add wrapper class bundling the various formatting functions bound to a specific locale and time-zone. cmlenz parents: 72 diff changeset	131 """Return the given decimal number formatted for a specific locale.
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	132
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	133 >>> format_decimal(1.2345, locale='en_US')
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	134 u'1.234'
50 0896af2c49ec Added round-half-even (banker's rounding) support. jonas parents: 39 diff changeset	135 >>> format_decimal(1.2346, locale='en_US')
0896af2c49ec Added round-half-even (banker's rounding) support. jonas parents: 39 diff changeset	136 u'1.235'
0896af2c49ec Added round-half-even (banker's rounding) support. jonas parents: 39 diff changeset	137 >>> format_decimal(-1.2346, locale='en_US')
0896af2c49ec Added round-half-even (banker's rounding) support. jonas parents: 39 diff changeset	138 u'-1.235'
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	139 >>> format_decimal(1.2345, locale='sv_SE')
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	140 u'1,234'
50 0896af2c49ec Added round-half-even (banker's rounding) support. jonas parents: 39 diff changeset	141 >>> format_decimal(12345, locale='de')
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	142 u'12.345'
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	143
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	144 The appropriate thousands grouping and the decimal separator are used for
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	145 each locale:
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	146
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	147 >>> format_decimal(12345.5, locale='en_US')
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	148 u'12,345.5'
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	149
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	150 :param number: the number to format
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	151 :param format:
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	152 :param locale: the `Locale` object or locale identifier
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	153 :return: the formatted decimal number
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	154 :rtype: `unicode`
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	155 """
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	156 locale = Locale.parse(locale)
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	157 if not format:
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	158 format = locale.decimal_formats.get(format)
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	159 pattern = parse_pattern(format)
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	160 return pattern.apply(number, locale)
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	161
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	162 def format_currency(number, currency, format=None, locale=LC_NUMERIC):
133 32b28673cfd5 Minor doc fixes. cmlenz parents: 127 diff changeset	163 u"""Return formatted currency value.
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	164
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	165 >>> format_currency(1099.98, 'USD', locale='en_US')
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	166 u'$1,099.98'
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	167 >>> format_currency(1099.98, 'USD', locale='es_CO')
375 4eca63af0a12 Implement support for aliases in the CLDR data. Closes #68. Also, update to CLDR 1.6, and a much improved `dump_data` script. cmlenz parents: 357 diff changeset	168 u'US$\\xa01.099,98'
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	169 >>> format_currency(1099.98, 'EUR', locale='de_DE')
375 4eca63af0a12 Implement support for aliases in the CLDR data. Closes #68. Also, update to CLDR 1.6, and a much improved `dump_data` script. cmlenz parents: 357 diff changeset	170 u'1.099,98\\xa0\\u20ac'
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	171
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	172 The pattern can also be specified explicitly:
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	173
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	174 >>> format_currency(1099.98, 'EUR', u'\xa4\xa4 #,##0.00', locale='en_US')
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	175 u'EUR 1,099.98'
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	176
26 6041782ea677 * Reduce size of locale data pickles by only storing the data provided by each locale itself, and merging inherited data at runtime. cmlenz parents: 22 diff changeset	177 :param number: the number to format
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	178 :param currency: the currency code
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	179 :param locale: the `Locale` object or locale identifier
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	180 :return: the formatted currency value
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	181 :rtype: `unicode`
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	182 """
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	183 locale = Locale.parse(locale)
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	184 if not format:
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	185 format = locale.currency_formats.get(format)
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	186 pattern = parse_pattern(format)
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	187 return pattern.apply(number, locale, currency=currency)
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	188
26 6041782ea677 * Reduce size of locale data pickles by only storing the data provided by each locale itself, and merging inherited data at runtime. cmlenz parents: 22 diff changeset	189 def format_percent(number, format=None, locale=LC_NUMERIC):
101 0f641136aa6b Add wrapper class bundling the various formatting functions bound to a specific locale and time-zone. cmlenz parents: 72 diff changeset	190 """Return formatted percent value for a specific locale.
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	191
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	192 >>> format_percent(0.34, locale='en_US')
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	193 u'34%'
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	194 >>> format_percent(25.1234, locale='en_US')
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	195 u'2,512%'
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	196 >>> format_percent(25.1234, locale='sv_SE')
233 da97a3138239 Upgraded to CLDR 1.5 and improved timezone formatting. cmlenz parents: 218 diff changeset	197 u'2\\xa0512\\xa0%'
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	198
126 823bc6c83b88 Add test for permille number format. cmlenz parents: 125 diff changeset	199 The format pattern can also be specified explicitly:
823bc6c83b88 Add test for permille number format. cmlenz parents: 125 diff changeset	200
823bc6c83b88 Add test for permille number format. cmlenz parents: 125 diff changeset	201 >>> format_percent(25.1234, u'#,##0\u2030', locale='en_US')
823bc6c83b88 Add test for permille number format. cmlenz parents: 125 diff changeset	202 u'25,123\u2030'
823bc6c83b88 Add test for permille number format. cmlenz parents: 125 diff changeset	203
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	204 :param number: the percent number to format
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	205 :param format:
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	206 :param locale: the `Locale` object or locale identifier
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	207 :return: the formatted percent number
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	208 :rtype: `unicode`
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	209 """
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	210 locale = Locale.parse(locale)
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	211 if not format:
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	212 format = locale.percent_formats.get(format)
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	213 pattern = parse_pattern(format)
26 6041782ea677 * Reduce size of locale data pickles by only storing the data provided by each locale itself, and merging inherited data at runtime. cmlenz parents: 22 diff changeset	214 return pattern.apply(number, locale)
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	215
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	216 def format_scientific(number, format=None, locale=LC_NUMERIC):
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	217 """Return value formatted in scientific notation for a specific locale.
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	218
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	219 >>> format_scientific(10000, locale='en_US')
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	220 u'1E4'
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	221
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	222 The format pattern can also be specified explicitly:
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	223
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	224 >>> format_scientific(1234567, u'##0E00', locale='en_US')
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	225 u'1.23E06'
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	226
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	227 :param number: the number to format
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	228 :param format:
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	229 :param locale: the `Locale` object or locale identifier
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	230 :return: value formatted in scientific notation.
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	231 :rtype: `unicode`
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	232 """
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	233 locale = Locale.parse(locale)
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	234 if not format:
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	235 format = locale.scientific_formats.get(format)
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	236 pattern = parse_pattern(format)
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	237 return pattern.apply(number, locale)
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	238
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	239
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	240 class NumberFormatError(ValueError):
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	241 """Exception raised when a string cannot be parsed into a number."""
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	242
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	243
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	244 def parse_number(string, locale=LC_NUMERIC):
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	245 """Parse localized number string into a long integer.
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	246
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	247 >>> parse_number('1,099', locale='en_US')
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	248 1099L
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	249 >>> parse_number('1.099', locale='de_DE')
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	250 1099L
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	251
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	252 When the given string cannot be parsed, an exception is raised:
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	253
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	254 >>> parse_number('1.099,98', locale='de')
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	255 Traceback (most recent call last):
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	256 ...
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	257 NumberFormatError: '1.099,98' is not a valid number
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	258
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	259 :param string: the string to parse
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	260 :param locale: the `Locale` object or locale identifier
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	261 :return: the parsed number
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	262 :rtype: `long`
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	263 :raise `NumberFormatError`: if the string can not be converted to a number
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	264 """
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	265 try:
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	266 return long(string.replace(get_group_symbol(locale), ''))
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	267 except ValueError:
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	268 raise NumberFormatError('%r is not a valid number' % string)
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	269
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	270 def parse_decimal(string, locale=LC_NUMERIC):
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	271 """Parse localized decimal string into a float.
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	272
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	273 >>> parse_decimal('1,099.98', locale='en_US')
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	274 1099.98
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	275 >>> parse_decimal('1.099,98', locale='de')
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	276 1099.98
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	277
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	278 When the given string cannot be parsed, an exception is raised:
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	279
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	280 >>> parse_decimal('2,109,998', locale='de')
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	281 Traceback (most recent call last):
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	282 ...
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	283 NumberFormatError: '2,109,998' is not a valid decimal number
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	284
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	285 :param string: the string to parse
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	286 :param locale: the `Locale` object or locale identifier
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	287 :return: the parsed decimal number
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	288 :rtype: `float`
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	289 :raise `NumberFormatError`: if the string can not be converted to a
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	290 decimal number
1 7870274479f5 Import of initial code base. cmlenz parents: diff changeset	291 """
7870274479f5 Import of initial code base. cmlenz parents: diff changeset	292 locale = Locale.parse(locale)
32 ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	293 try:
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	294 return float(string.replace(get_group_symbol(locale), '')
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	295 .replace(get_decimal_symbol(locale), '.'))
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	296 except ValueError:
ac0957a8fd8b Started docs on number formatting/parsing. cmlenz parents: 26 diff changeset	297 raise NumberFormatError('%r is not a valid decimal number' % string)
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	298
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	299
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	300 PREFIX_END = r'[^0-9@#.,]'
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	301 NUMBER_TOKEN = r'[0-9@#.\-,E+]'
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	302
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	303 PREFIX_PATTERN = r"(?P<prefix>(?:'[^']'\|%s))" % PREFIX_END
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	304 NUMBER_PATTERN = r"(?P<number>%s+)" % NUMBER_TOKEN
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	305 SUFFIX_PATTERN = r"(?P<suffix>.*)"
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	306
127 1bf549a5dc1c Add a couple of CLI tests. cmlenz parents: 126 diff changeset	307 number_re = re.compile(r"%s%s%s" % (PREFIX_PATTERN, NUMBER_PATTERN,
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	308 SUFFIX_PATTERN))
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	309
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	310 def split_number(value):
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	311 """Convert a number into a (intasstring, fractionasstring) tuple"""
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	312 if have_decimal and isinstance(value, Decimal):
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	313 text = str(value)
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	314 else:
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	315 text = ('%.9f' % value).rstrip('0')
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	316 if '.' in text:
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	317 a, b = text.split('.', 1)
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	318 if b == '0':
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	319 b = ''
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	320 else:
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	321 a, b = text, ''
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	322 return a, b
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	323
212 2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	324 def bankersround(value, ndigits=0):
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	325 """Round a number to a given precision.
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	326
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	327 Works like round() except that the round-half-even (banker's rounding)
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	328 algorithm is used instead of round-half-up.
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	329
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	330 >>> bankersround(5.5, 0)
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	331 6.0
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	332 >>> bankersround(6.5, 0)
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	333 6.0
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	334 >>> bankersround(-6.5, 0)
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	335 -6.0
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	336 >>> bankersround(1234.0, -2)
212 2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	337 1200.0
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	338 """
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	339 sign = int(value < 0) and -1 or 1
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	340 value = abs(value)
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	341 a, b = split_number(value)
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	342 digits = a + b
212 2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	343 add = 0
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	344 i = len(a) + ndigits
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	345 if i < 0 or i >= len(digits):
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	346 pass
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	347 elif digits[i] > '5':
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	348 add = 1
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	349 elif digits[i] == '5' and digits[i-1] in '13579':
2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	350 add = 1
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	351 scale = 10**ndigits
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	352 if have_decimal and isinstance(value, Decimal):
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	353 return Decimal(int(value * scale + add)) / scale * sign
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	354 else:
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	355 return float(int(value * scale + add)) / scale * sign
212 2b0b9bb94660 Switched to using our own round() implementation. jonas parents: 211 diff changeset	356
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	357 def parse_pattern(pattern):
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	358 """Parse number format patterns"""
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	359 if isinstance(pattern, NumberPattern):
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	360 return pattern
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	361
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	362 # Do we have a negative subpattern?
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	363 if ';' in pattern:
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	364 pattern, neg_pattern = pattern.split(';', 1)
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	365 pos_prefix, number, pos_suffix = number_re.search(pattern).groups()
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	366 neg_prefix, _, neg_suffix = number_re.search(neg_pattern).groups()
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	367 else:
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	368 pos_prefix, number, pos_suffix = number_re.search(pattern).groups()
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	369 neg_prefix = '-' + pos_prefix
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	370 neg_suffix = pos_suffix
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	371 if 'E' in number:
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	372 number, exp = number.split('E', 1)
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	373 else:
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	374 exp = None
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	375 if '@' in number:
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	376 if '.' in number and '0' in number:
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	377 raise ValueError('Significant digit patterns can not contain '
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	378 '"@" or "0"')
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	379 if '.' in number:
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	380 integer, fraction = number.rsplit('.', 1)
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	381 else:
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	382 integer = number
d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	383 fraction = ''
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	384 min_frac = max_frac = 0
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	385
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	386 def parse_precision(p):
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	387 """Calculate the min and max allowed digits"""
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	388 min = max = 0
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	389 for c in p:
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	390 if c in '@0':
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	391 min += 1
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	392 max += 1
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	393 elif c == '#':
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	394 max += 1
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	395 elif c == ',':
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	396 continue
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	397 else:
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	398 break
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	399 return min, max
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	400
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	401 def parse_grouping(p):
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	402 """Parse primary and secondary digit grouping
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	403
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	404 >>> parse_grouping('##')
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	405 0, 0
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	406 >>> parse_grouping('#,###')
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	407 3, 3
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	408 >>> parse_grouping('#,####,###')
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	409 3, 4
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	410 """
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	411 width = len(p)
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	412 g1 = p.rfind(',')
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	413 if g1 == -1:
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	414 return 1000, 1000
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	415 g1 = width - g1 - 1
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	416 g2 = p[:-g1 - 1].rfind(',')
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	417 if g2 == -1:
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	418 return g1, g1
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	419 g2 = width - g1 - g2 - 2
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	420 return g1, g2
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	421
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	422 int_prec = parse_precision(integer)
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	423 frac_prec = parse_precision(fraction)
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	424 if exp:
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	425 frac_prec = parse_precision(integer+fraction)
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	426 exp_plus = exp.startswith('+')
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	427 exp = exp.lstrip('+')
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	428 exp_prec = parse_precision(exp)
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	429 else:
1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	430 exp_plus = None
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	431 exp_prec = None
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	432 grouping = parse_grouping(integer)
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	433 return NumberPattern(pattern, (pos_prefix, neg_prefix),
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	434 (pos_suffix, neg_suffix), grouping,
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	435 int_prec, frac_prec,
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	436 exp_prec, exp_plus)
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	437
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	438
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	439 class NumberPattern(object):
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	440
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	441 def __init__(self, pattern, prefix, suffix, grouping,
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	442 int_prec, frac_prec, exp_prec, exp_plus):
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	443 self.pattern = pattern
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	444 self.prefix = prefix
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	445 self.suffix = suffix
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	446 self.grouping = grouping
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	447 self.int_prec = int_prec
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	448 self.frac_prec = frac_prec
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	449 self.exp_prec = exp_prec
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	450 self.exp_plus = exp_plus
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	451 if '%' in ''.join(self.prefix + self.suffix):
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	452 self.scale = 100
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	453 elif u'‰' in ''.join(self.prefix + self.suffix):
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	454 self.scale = 1000
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	455 else:
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	456 self.scale = 1
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	457
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	458 def __repr__(self):
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	459 return '<%s %r>' % (type(self).__name__, self.pattern)
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	460
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	461 def apply(self, value, locale, currency=None):
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	462 value *= self.scale
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	463 is_negative = int(value < 0)
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	464 if self.exp_prec: # Scientific notation
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	465 value = abs(value)
357 ce1f9919f8c9 Fix scientific notation for 0. closes #99 aronacher parents: 246 diff changeset	466 if value:
ce1f9919f8c9 Fix scientific notation for 0. closes #99 aronacher parents: 246 diff changeset	467 exp = int(math.floor(math.log(value, 10)))
ce1f9919f8c9 Fix scientific notation for 0. closes #99 aronacher parents: 246 diff changeset	468 else:
ce1f9919f8c9 Fix scientific notation for 0. closes #99 aronacher parents: 246 diff changeset	469 exp = 0
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	470 # Minimum number of integer digits
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	471 if self.int_prec[0] == self.int_prec[1]:
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	472 exp -= self.int_prec[0] - 1
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	473 # Exponent grouping
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	474 elif self.int_prec[1]:
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	475 exp = int(exp) / self.int_prec[1] * self.int_prec[1]
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	476 if not have_decimal or not isinstance(value, Decimal):
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	477 value = float(value)
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	478 if exp < 0:
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	479 value = value * 10**(-exp)
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	480 else:
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	481 value = value / 10**exp
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	482 exp_sign = ''
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	483 if exp < 0:
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	484 exp_sign = get_minus_sign_symbol(locale)
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	485 elif self.exp_plus:
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	486 exp_sign = get_plus_sign_symbol(locale)
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	487 exp = abs(exp)
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	488 number = u'%s%s%s%s' % \
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	489 (self._format_sigdig(value, self.frac_prec[0],
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	490 self.frac_prec[1]),
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	491 get_exponential_symbol(locale), exp_sign,
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	492 self._format_int(str(exp), self.exp_prec[0],
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	493 self.exp_prec[1], locale))
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	494 elif '@' in self.pattern: # Is it a siginificant digits pattern?
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	495 text = self._format_sigdig(abs(value),
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	496 self.int_prec[0],
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	497 self.int_prec[1])
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	498 if '.' in text:
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	499 a, b = text.split('.')
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	500 a = self._format_int(a, 0, 1000, locale)
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	501 if b:
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	502 b = get_decimal_symbol(locale) + b
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	503 number = a + b
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	504 else:
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	505 number = self._format_int(text, 0, 1000, locale)
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	506 else: # A normal number pattern
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	507 a, b = split_number(bankersround(abs(value),
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	508 self.frac_prec[1]))
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	509 b = b or '0'
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	510 a = self._format_int(a, self.int_prec[0],
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	511 self.int_prec[1], locale)
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	512 b = self._format_frac(b, locale)
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	513 number = a + b
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	514 retval = u'%s%s%s' % (self.prefix[is_negative], number,
c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	515 self.suffix[is_negative])
125 061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	516 if u'¤' in retval:
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	517 retval = retval.replace(u'¤¤', currency.upper())
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	518 retval = retval.replace(u'¤', get_currency_symbol(currency, locale))
061ea0e0ac8c Add currency formatting. cmlenz parents: 101 diff changeset	519 return retval
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	520
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	521 def _format_sigdig(self, value, min, max):
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	522 """Convert value to a string.
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	523
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	524 The resulting string will contain between (min, max) number of
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	525 significant digits.
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	526 """
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	527 a, b = split_number(value)
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	528 ndecimals = len(a)
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	529 if a == '0' and b != '':
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	530 ndecimals = 0
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	531 while b.startswith('0'):
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	532 b = b[1:]
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	533 ndecimals -= 1
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	534 a, b = split_number(bankersround(value, max - ndecimals))
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	535 digits = len((a + b).lstrip('0'))
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	536 if not digits:
211 5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	537 digits = 1
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	538 # Figure out if we need to add any trailing '0':s
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	539 if len(a) >= max and a != '0':
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	540 return a
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	541 if digits < min:
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	542 b += ('0' * (min - digits))
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	543 if b:
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	544 return '%s.%s' % (a, b)
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	545 return a
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	546
5125934e5f27 Added support for siginificant digits in number patterns. jonas parents: 137 diff changeset	547 def _format_int(self, value, min, max, locale):
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	548 width = len(value)
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	549 if width < min:
243 1e5787ab265b Added initial support for scientific notation patterns. jonas parents: 233 diff changeset	550 value = '0' * (min - width) + value
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	551 gsize = self.grouping[0]
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	552 ret = ''
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	553 symbol = get_group_symbol(locale)
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	554 while len(value) > gsize:
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	555 ret = symbol + value[-gsize:] + ret
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	556 value = value[:-gsize]
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	557 gsize = self.grouping[1]
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	558 return value + ret
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	559
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	560 def _format_frac(self, value, locale):
244 c24846890620 Added `Decimal` support to the scientific notation formatter and some code cleanup. This closes #52. jonas parents: 243 diff changeset	561 min, max = self.frac_prec
218 cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	562 if len(value) < min:
cc699743ec06 Added Decimal support to the number formatter. jonas parents: 212 diff changeset	563 value += ('0' * (min - len(value)))
22 d1e6944f2ff0 Implemented babel.numbers.format_percent jonas parents: 9 diff changeset	564 if max == 0 or (min == 0 and int(value) == 0):
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	565 return ''
9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	566 width = len(value)
50 0896af2c49ec Added round-half-even (banker's rounding) support. jonas parents: 39 diff changeset	567 while len(value) > min and value[-1] == '0':
0896af2c49ec Added round-half-even (banker's rounding) support. jonas parents: 39 diff changeset	568 value = value[:-1]
9 9ed6cf5975a1 Add basic support for number format patterns. jonas parents: 1 diff changeset	569 return get_decimal_symbol(locale) + value

Mercurial > babel > mirror

annotate babel/numbers.py @ 375:4eca63af0a12 trunk