Commits

Floris Bruynooghe committed a4ad4a0

Use py.builtin._basestring

Comments (0)

Files changed (1)

_pytest/skipping.py

 import py, pytest
 import sys
 
-# Provide basestring in python3
-try:
-    basestring = basestring
-except NameError:
-    basestring = str
-
 def pytest_addoption(parser):
     group = parser.getgroup("general")
     group.addoption('--runxfail',
                 self.result = False
                 for expr in self.holder.args:
                     self.expr = expr
-                    if isinstance(expr, basestring):
+                    if isinstance(expr, py.builtin._basestring):
                         result = cached_eval(self.item.config, expr, d)
                     else:
                         pytest.fail("expression is not a string")
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.