summaryrefslogtreecommitdiff
path: root/tests/humanize_tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-04-07 22:04:45 -0400
committerTim Graham <timograham@gmail.com>2016-04-08 10:12:33 -0400
commit92053acbb9160862c3e743a99ed8ccff8d4f8fd6 (patch)
tree50e7fd28a650f0e2352cf94f92e5a66d28a81988 /tests/humanize_tests
parentdf8d8d4292684d6ffa7474f1e201aed486f02b53 (diff)
downloaddjango-92053acbb9160862c3e743a99ed8ccff8d4f8fd6.tar.gz
Fixed E128 flake8 warnings in tests/.
Diffstat (limited to 'tests/humanize_tests')
-rw-r--r--tests/humanize_tests/tests.py67
1 files changed, 39 insertions, 28 deletions
diff --git a/tests/humanize_tests/tests.py b/tests/humanize_tests/tests.py
index f5dc3edfc7..e2fa66976a 100644
--- a/tests/humanize_tests/tests.py
+++ b/tests/humanize_tests/tests.py
@@ -70,24 +70,30 @@ class HumanizeTests(TestCase):
self.humanize_tester(test_list, result_list, 'ordinal', lambda x: x)
def test_intcomma(self):
- test_list = (100, 1000, 10123, 10311, 1000000, 1234567.25,
- '100', '1000', '10123', '10311', '1000000', '1234567.1234567', Decimal('1234567.1234567'),
- None)
- result_list = ('100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.25',
- '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567', '1,234,567.1234567',
- None)
-
+ test_list = (
+ 100, 1000, 10123, 10311, 1000000, 1234567.25, '100', '1000',
+ '10123', '10311', '1000000', '1234567.1234567',
+ Decimal('1234567.1234567'), None,
+ )
+ result_list = (
+ '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.25',
+ '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567',
+ '1,234,567.1234567', None,
+ )
with translation.override('en'):
self.humanize_tester(test_list, result_list, 'intcomma')
def test_l10n_intcomma(self):
- test_list = (100, 1000, 10123, 10311, 1000000, 1234567.25,
- '100', '1000', '10123', '10311', '1000000', '1234567.1234567', Decimal('1234567.1234567'),
- None)
- result_list = ('100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.25',
- '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567', '1,234,567.1234567',
- None)
-
+ test_list = (
+ 100, 1000, 10123, 10311, 1000000, 1234567.25, '100', '1000',
+ '10123', '10311', '1000000', '1234567.1234567',
+ Decimal('1234567.1234567'), None,
+ )
+ result_list = (
+ '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.25',
+ '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567',
+ '1,234,567.1234567', None,
+ )
with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=False):
with translation.override('en'):
self.humanize_tester(test_list, result_list, 'intcomma')
@@ -98,14 +104,16 @@ class HumanizeTests(TestCase):
self.humanize_tester([100], ['100'], 'intcomma')
def test_intword(self):
- test_list = ('100', '1000000', '1200000', '1290000',
- '1000000000', '2000000000', '6000000000000',
- '1300000000000000', '3500000000000000000000',
- '8100000000000000000000000000000000', None)
- result_list = ('100', '1.0 million', '1.2 million', '1.3 million',
- '1.0 billion', '2.0 billion', '6.0 trillion',
- '1.3 quadrillion', '3.5 sextillion',
- '8.1 decillion', None)
+ test_list = (
+ '100', '1000000', '1200000', '1290000', '1000000000', '2000000000',
+ '6000000000000', '1300000000000000', '3500000000000000000000',
+ '8100000000000000000000000000000000', None,
+ )
+ result_list = (
+ '100', '1.0 million', '1.2 million', '1.3 million', '1.0 billion',
+ '2.0 billion', '6.0 trillion', '1.3 quadrillion', '3.5 sextillion',
+ '8.1 decillion', None,
+ )
with translation.override('en'):
self.humanize_tester(test_list, result_list, 'intword')
@@ -119,10 +127,14 @@ class HumanizeTests(TestCase):
self.humanize_tester(test_list, result_list, 'intcomma')
def test_i18n_intword(self):
- test_list = ('100', '1000000', '1200000', '1290000',
- '1000000000', '2000000000', '6000000000000')
- result_list = ('100', '1,0 Million', '1,2 Millionen', '1,3 Millionen',
- '1,0 Milliarde', '2,0 Milliarden', '6,0 Billionen')
+ test_list = (
+ '100', '1000000', '1200000', '1290000', '1000000000', '2000000000',
+ '6000000000000',
+ )
+ result_list = (
+ '100', '1,0 Million', '1,2 Millionen', '1,3 Millionen',
+ '1,0 Milliarde', '2,0 Milliarden', '6,0 Billionen',
+ )
with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True):
with translation.override('de'):
self.humanize_tester(test_list, result_list, 'intword')
@@ -130,8 +142,7 @@ class HumanizeTests(TestCase):
def test_apnumber(self):
test_list = [str(x) for x in range(1, 11)]
test_list.append(None)
- result_list = ('one', 'two', 'three', 'four', 'five', 'six',
- 'seven', 'eight', 'nine', '10', None)
+ result_list = ('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', '10', None)
with translation.override('en'):
self.humanize_tester(test_list, result_list, 'apnumber')