Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP locale fix #136

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

WIP locale fix #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions requirements-development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ requests
lxml
xlrd
xlwt
openpyxl

# Test tools
coverage
Expand Down
8 changes: 6 additions & 2 deletions rows/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import re
import types

from locale import localeconv

from decimal import Decimal, InvalidOperation


Expand All @@ -33,6 +35,8 @@
REGEXP_ONLY_NUMBERS = re.compile('[^0-9]')
SHOULD_NOT_USE_LOCALE = True # This variable is changed by rows.locale_manager
NULL = (b'-', b'null', b'none', b'nil', b'n/a', b'na')
DP = localeconv()['decimal_point']
TS = localeconv()['thousands_sep']


class Field(object):
Expand Down Expand Up @@ -213,11 +217,11 @@ def serialize(cls, value, *args, **kwargs):
return value_as_string
else:
grouping = kwargs.get('grouping', None)
has_decimal_places = value_as_string.find('.') != -1
has_decimal_places = value_as_string.find(DP) != -1
if not has_decimal_places:
string_format = '%d'
else:
decimal_places = len(value_as_string.split('.')[1])
decimal_places = len(value_as_string.split(DP)[1])
string_format = '%.{}f'.format(decimal_places)
return locale.format(string_format, value, grouping=grouping)

Expand Down
31 changes: 18 additions & 13 deletions tests/tests_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import types

from decimal import Decimal
from locale import getdefaultlocale, localeconv

import rows
import platform
Expand All @@ -32,7 +33,11 @@
if platform.system() == 'Windows':
locale_name = str('ptb_bra')
else:
locale_name = 'pt_BR.UTF-8'
defaultlocale = getdefaultlocale()
locale_name = '{}.{}'.format(defaultlocale[0], defaultlocale[1])

dp = localeconv()['decimal_point']
ts = localeconv()['thousands_sep']

class FieldsTestCase(unittest.TestCase):

Expand Down Expand Up @@ -107,7 +112,7 @@ def test_IntegerField(self):
types.UnicodeType)
self.assertEqual(fields.IntegerField.serialize(42000,
grouping=True),
'42.000')
'42{}000'.format(ts))
self.assertEqual(fields.IntegerField.deserialize('42.000'), 42000)
self.assertEqual(fields.IntegerField.deserialize(42), 42)
self.assertEqual(fields.IntegerField.deserialize(42.0), 42)
Expand All @@ -126,7 +131,7 @@ def test_FloatField(self):
self.assertEqual(fields.FloatField.deserialize(42.0), 42.0)
self.assertEqual(fields.FloatField.deserialize(42), 42.0)
self.assertEqual(fields.FloatField.deserialize(None), None)
self.assertEqual(fields.FloatField.serialize(42.0), '42.0')
self.assertEqual(fields.FloatField.serialize(42.0), '42{}0'.format(dp))
self.assertIs(type(fields.FloatField.serialize(42.0)),
types.UnicodeType)

Expand Down Expand Up @@ -169,18 +174,18 @@ def test_DecimalField(self):
)
self.assertEqual(fields.DecimalField.serialize(Decimal('4200')),
'4200')
self.assertEqual(fields.DecimalField.serialize(Decimal('42.0')),
'42,0')
self.assertEqual(fields.DecimalField.serialize(Decimal('42000.0')),
'42000,0')
self.assertEqual(fields.DecimalField.deserialize('42.000,00'),
Decimal('42000.00'))
self.assertEqual(fields.DecimalField.serialize(Decimal('42{}0'.format(ts))),
'42{}0'.format(ts))
self.assertEqual(fields.DecimalField.serialize(Decimal('42000{}0'.format(dp))),
'42000{}0'.format(dp))
self.assertEqual(fields.DecimalField.deserialize('42{}000{}00'.format(ts, dp)),
Decimal('42000{}00'.format(dp)))
self.assertEqual(
fields.DecimalField.serialize(
Decimal('42000.0'),
Decimal('42000{}0'.format(dp)),
grouping=True
),
'42.000,0'
'42{}000{}0'.format(ts, dp)
)
self.assertEqual(fields.DecimalField.deserialize(42000),
Decimal('42000'))
Expand Down Expand Up @@ -215,8 +220,8 @@ def test_PercentField(self):
'4200%')
self.assertEqual(fields.PercentField.serialize(Decimal('42000.0')),
'4200000%')
self.assertEqual(fields.PercentField.deserialize('42.000,00%'),
Decimal('420.0000'))
self.assertEqual(fields.PercentField.deserialize('42{}000{}00%'.format(ts, dp)),
Decimal('420{}0000'.format(ts)))
self.assertEqual(fields.PercentField.serialize(Decimal('42000.00'),
grouping=True),
'4.200.000%')
Expand Down
5 changes: 4 additions & 1 deletion tests/tests_localization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import unittest
import platform

from locale import getdefaultlocale

import rows
import rows.fields

Expand All @@ -37,7 +39,8 @@ def test_locale_context(self):
if platform.system() == 'Windows':
name = str('ptb_bra')
else:
name = 'pt_BR.UTF-8'
defaultlocale = getdefaultlocale()
name = '{}.{}'.format(defaultlocale[0], defaultlocale[1])
with locale_context(name):
self.assertFalse(rows.fields.SHOULD_NOT_USE_LOCALE)
self.assertTrue(rows.fields.SHOULD_NOT_USE_LOCALE)