openstack/deb-python-colander
Code Issues Proposed changes

borrow is_nonstr_iter from pyramid and use it instead of simple isinstance check

Browse Source
This commit is contained in:
Chris McDonough
2012-02-07 21:59:42 -05:00
parent 0fd52a4c23
commit cb10f1404b
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
colander/__init__.py
View File

@@ -11,6 +11,7 @@ from .compat import (
text_type, text_type,
string_types, string_types,
xrange, xrange,
is_nonstr_iter,
) )
from . import iso8601 from . import iso8601
@@ -75,9 +76,9 @@ class Invalid(Exception):
``msg`` attribute is iterable, it is returned. If it is not ``msg`` attribute is iterable, it is returned. If it is not
iterable, a single-element list containing the ``msg`` value iterable, a single-element list containing the ``msg`` value
is returned.""" is returned."""
if isinstance(self.msg, string_types): if is_nonstr_iter(self.msg):
return [self.msg] return self.msg
return self.msg return [self.msg]
def add(self, exc, pos=None): def add(self, exc, pos=None):
""" Add a child exception; ``exc`` must be an instance of """ Add a child exception; ``exc`` must be an instance of

9
colander/compat.py
View File

@@ -16,6 +16,15 @@ def text_(s, encoding='latin-1', errors='strict'):
return s.decode(encoding, errors) return s.decode(encoding, errors)
return s # pragma: no cover return s # pragma: no cover
if PY3: # pragma: no cover
def is_nonstr_iter(v):
if isinstance(v, str):
return False
return hasattr(v, '__iter__')
else:
def is_nonstr_iter(v):
return hasattr(v, '__iter__')
try: try:
xrange = xrange xrange = xrange
except NameError: # pragma: no cover except NameError: # pragma: no cover