Commit59e0ab9

committed

Merge pull request#6014 from afvincent/afvincent-patch-issue-6009

FIX: EngFormatter without but without prefixcloses#6009

1 parent1e35d8d commit59e0ab9Copy full SHA for 59e0ab9

File tree

+27

-2

lines changed

+27

-2

lines changed

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -413,6 +413,27 @@ def test_formatstrformatter():`
`413`	`413`	`tmp_form=mticker.StrMethodFormatter('{x:05d}')`
`414`	`414`	`nose.tools.assert_equal('00002',tmp_form(2))`
`415`	`415`
	`416`	`+`
	`417`	`+deftest_EngFormatter_formatting():`
	`418`	`+"""`
	`419`	`+ Create two instances of EngFormatter with default parameters, with and`
	`420`	`+ without a unit string ('s' for seconds). Test the formatting in some cases,`
	`421`	`+ especially the case when no SI prefix is present, for values in [1, 1000).`
	`422`	`+`
	`423`	`+ Should not raise exceptions.`
	`424`	`+ """`
	`425`	`+unitless=mticker.EngFormatter()`
	`426`	`+nose.tools.assert_equal(unitless(0.1),u'100 m')`
	`427`	`+nose.tools.assert_equal(unitless(1),u'1')`
	`428`	`+nose.tools.assert_equal(unitless(999.9),u'999.9')`
	`429`	`+nose.tools.assert_equal(unitless(1001),u'1.001 k')`
	`430`	`+`
	`431`	`+with_unit=mticker.EngFormatter(unit=u's')`
	`432`	`+nose.tools.assert_equal(with_unit(0.1),u'100 ms')`
	`433`	`+nose.tools.assert_equal(with_unit(1),u'1 s')`
	`434`	`+nose.tools.assert_equal(with_unit(999.9),u'999.9 s')`
	`435`	`+nose.tools.assert_equal(with_unit(1001),u'1.001 ks')`
	`436`	`+`
`416`	`437`	`if__name__=='__main__':`
`417`	`438`	`importnose`
`418`	`439`	`nose.runmodule(argv=['-s','--with-doctest'],exit=False)`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1005,7 +1005,7 @@ class EngFormatter(Formatter):`
`1005`	`1005`	`suitable for use with single-letter representations of powers of`
`1006`	`1006`	`1000. For example, 'Hz' or 'm'.`
`1007`	`1007`
`1008`		- `places` is thepercision with which to display the number,
	`1008`	+ `places` is theprecision with which to display the number,
`1009`	`1009`	`specified in digits after the decimal point (there will be between`
`1010`	`1010`	`one and three digits before the decimal point).`
`1011`	`1011`	`"""`
`@@ -1087,7 +1087,11 @@ def format_eng(self, num):`
`1087`	`1087`
`1088`	`1088`	`formatted=format_str% (mant,prefix)`
`1089`	`1089`
`1090`		`-returnformatted.strip()`
	`1090`	`+formatted=formatted.strip()`
	`1091`	`+if (self.unit!="")and (prefix==self.ENG_PREFIXES[0]):`
	`1092`	`+formatted=formatted+" "`
	`1093`	`+`
	`1094`	`+returnformatted`
`1091`	`1095`
`1092`	`1096`
`1093`	`1097`	`classLocator(TickHelper):`

Comments

(0)