convert py module references to six module

This commit is contained in:
Srinivas Reddy Thatiparthy
2017-08-02 23:03:52 +05:30
parent eb1bd3449e
commit dc563e4954
18 changed files with 60 additions and 57 deletions

View File

@@ -3,6 +3,7 @@ from __future__ import absolute_import, division, print_function
import functools
import os
import six
import sys
import _pytest
@@ -397,7 +398,7 @@ class Node(object):
``marker`` can be a string or pytest.mark.* instance.
"""
from _pytest.mark import MarkDecorator, MARK_GEN
if isinstance(marker, py.builtin._basestring):
if isinstance(marker, six.string_types):
marker = getattr(MARK_GEN, marker)
elif not isinstance(marker, MarkDecorator):
raise ValueError("is not a string or pytest.mark.* Marker")