Revision 92cb0768 commissioning/api/specificator.py
b/commissioning/api/specificator.py | ||
---|---|---|
1 | 1 |
# -*- coding: utf8 -*- |
2 | 2 |
from random import random, choice, randint |
3 | 3 |
from math import log |
4 |
from inspect import isclass |
|
4 | 5 |
|
5 | 6 |
def shorts(s): |
6 | 7 |
if not isinstance(s, unicode): |
... | ... | |
33 | 34 |
opts = {} |
34 | 35 |
for k, v in kw.items(): |
35 | 36 |
if not isinstance(v, Canonical): |
37 |
if isclass(v) and issubclass(v, Canonical): |
|
38 |
m = ("argument '%s': value '%s' is a Canonical _class_. " |
|
39 |
"Perhaps you meant to specify a Canonical _instance_" |
|
40 |
% (k, v)) |
|
41 |
raise SpecifyException(m) |
|
36 | 42 |
opts[k] = v |
37 | 43 |
del kw[k] |
38 | 44 |
|
... | ... | |
146 | 152 |
raise CanonifyException(m) |
147 | 153 |
except TypeError, e: |
148 | 154 |
m = "%s: cannot convert '%s' to long" % (self, shorts(item)) |
149 |
raise CanonifyException(m)
|
|
155 |
raise CanonifyException(m)
|
|
150 | 156 |
|
151 | 157 |
optget = self.opts.get |
152 | 158 |
minimum = optget('minimum', None) |
Also available in: Unified diff