openstack/deb-python-colander
Code Issues Proposed changes

switch compat to special-case py2

Browse Source
This commit is contained in:
Michael Merickel
2016-01-15 20:17:56 -06:00
parent d59c27652c
commit 57c377a097
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
colander/compat.py
View File

@@ -1,13 +1,14 @@
import sys import sys
PY2 = sys.version_info[0] == 2
PY3 = sys.version_info[0] == 3 PY3 = sys.version_info[0] == 3
if PY3: # pragma: no cover if PY2:
string_types = str,
text_type = str
else: # pragma: no cover
string_types = basestring, string_types = basestring,
text_type = unicode text_type = unicode
else:
string_types = str,
text_type = str
def text_(s, encoding='latin-1', errors='strict'): def text_(s, encoding='latin-1', errors='strict'):
""" If ``s`` is an instance of ``bytes``, return ``s.decode(encoding, """ If ``s`` is an instance of ``bytes``, return ``s.decode(encoding,
@@ -16,14 +17,14 @@ 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 if PY2:
def is_nonstr_iter(v):
return hasattr(v, '__iter__')
else:
def is_nonstr_iter(v): def is_nonstr_iter(v):
if isinstance(v, str): if isinstance(v, str):
return False return False
return hasattr(v, '__iter__') return hasattr(v, '__iter__')
else: # pragma: no cover
def is_nonstr_iter(v):
return hasattr(v, '__iter__')
try: try:
xrange = xrange xrange = xrange