summaryrefslogtreecommitdiff
path: root/_pytest
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2016-09-02 18:25:26 -0300
committerBruno Oliveira <nicoddemus@gmail.com>2016-09-02 18:38:15 -0300
commit1e10de574dc9c08c9a2af8b74380feb28da8c28b (patch)
tree9230ce8da04427b985e95ae3f1fbadd3a95b5eaf /_pytest
parent722f9eadcd6d7355681bcba5f22774d2fe4a1f26 (diff)
downloadpytest-1e10de574dc9c08c9a2af8b74380feb28da8c28b.tar.gz
The "ids" argument to "parametrize" again accepts unicode strings in Python 2
Fixes #1905
Diffstat (limited to '_pytest')
-rw-r--r--_pytest/python.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/_pytest/python.py b/_pytest/python.py
index 2ab1de6b0..33e7cff66 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -832,7 +832,7 @@ class Metafunc(fixtures.FuncargnamesCompatAttr):
raise ValueError('%d tests specified with %d ids' %(
len(argvalues), len(ids)))
for id_value in ids:
- if id_value is not None and not isinstance(id_value, str):
+ if id_value is not None and not isinstance(id_value, py.builtin._basestring):
msg = 'ids must be list of strings, found: %s (type: %s)'
raise ValueError(msg % (saferepr(id_value), type(id_value).__name__))
ids = idmaker(argnames, argvalues, idfn, ids, self.config)