diff options
author | Sylvain Th?nault <sylvain.thenault@logilab.fr> | 2009-10-01 17:40:40 +0200 |
---|---|---|
committer | Sylvain Th?nault <sylvain.thenault@logilab.fr> | 2009-10-01 17:40:40 +0200 |
commit | c5751d605ab9ce2228cc09ce1e26e53a84f2e8ba (patch) | |
tree | 6246356e4bc9c2d98115cfd53c4bb8aa695b0753 | |
parent | d7194f4a475700493336d29d8f8cfbee4b0f5347 (diff) | |
parent | cc57ce3417fe92023ee3f51242217aea549f983e (diff) | |
download | logilab-common-c5751d605ab9ce2228cc09ce1e26e53a84f2e8ba.tar.gz |
merge
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | optik_ext.py | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -2,7 +2,10 @@ ChangeLog for logilab.common ============================ -- - * configuration: fix #8849 Using plugins, options and .pylintrc crashes PyLint + * configuration: + - proper bytes and time option types support + - make Method usable as 'callback' value + - fix #8849 Using plugins, options and .pylintrc crashes PyLint 2009-08-26 -- 0.45.0 * added function for parsing XML processing instructions diff --git a/optik_ext.py b/optik_ext.py index 0b1a1b6..7305b7b 100644 --- a/optik_ext.py +++ b/optik_ext.py @@ -170,7 +170,7 @@ def check_color(option, opt, value): def check_time(option, opt, value): from logilab.common.textutils import TIME_UNITS, apply_units - if isinstance(value, (int, long)): + if isinstance(value, (int, long, float)): return value return apply_units(value, TIME_UNITS) |