@@ -403,7 +403,7 @@ def test_to_string_float_formatting(self):
403
403
404
404
# Python 2.5 just wants me to be sad. And debian 32-bit
405
405
#sys.version_info[0] == 2 and sys.version_info[1] < 6:
406
- if '%.4g' % 1.7e8 == '1.7e+008' :
406
+ if _three_digit_exp () :
407
407
expected = (' x\n 0 0.00000e+000\n 1 2.50000e-001\n '
408
408
'2 3.45600e+003\n 3 1.20000e+046\n 4 1.64000e+006\n '
409
409
'5 1.70000e+008\n 6 1.25346e+000\n 7 3.14159e+000\n '
@@ -430,7 +430,7 @@ def test_to_string_float_formatting(self):
430
430
df_s = df .to_string ()
431
431
# Python 2.5 just wants me to be sad. And debian 32-bit
432
432
#sys.version_info[0] == 2 and sys.version_info[1] < 6:
433
- if '%.4g' % 1.7e8 == '1.7e+008' :
433
+ if _three_digit_exp () :
434
434
expected = (' x\n '
435
435
'0 1.000000e+009\n '
436
436
'1 2.512000e-001' )
@@ -782,7 +782,10 @@ def test_float_trim_zeros(self):
782
782
2.03954217305e+10 , 5.59897817305e+10 ]
783
783
skip = True
784
784
for line in repr (DataFrame ({'A' : vals })).split ('\n ' ):
785
- self .assert_ (('+10' in line ) or skip )
785
+ if _three_digit_exp ():
786
+ self .assert_ (('+010' in line ) or skip )
787
+ else :
788
+ self .assert_ (('+10' in line ) or skip )
786
789
skip = False
787
790
788
791
def test_dict_entries (self ):
@@ -881,7 +884,10 @@ def test_float_trim_zeros(self):
881
884
vals = [2.08430917305e+10 , 3.52205017305e+10 , 2.30674817305e+10 ,
882
885
2.03954217305e+10 , 5.59897817305e+10 ]
883
886
for line in repr (Series (vals )).split ('\n ' ):
884
- self .assert_ ('+10' in line )
887
+ if _three_digit_exp ():
888
+ self .assert_ ('+010' in line )
889
+ else :
890
+ self .assert_ ('+10' in line )
885
891
886
892
def test_timedelta64 (self ):
887
893
Series (np .array ([1100 , 20 ], dtype = 'timedelta64[s]' )).to_string ()
@@ -1088,6 +1094,8 @@ def test_rounding(self):
1088
1094
result = formatter (0 )
1089
1095
self .assertEqual (result , u' 0.000' )
1090
1096
1097
+ def _three_digit_exp ():
1098
+ return '%.4g' % 1.7e8 == '1.7e+008'
1091
1099
1092
1100
class TestFloatArrayFormatter (unittest .TestCase ):
1093
1101
0 commit comments