diff options
author | Mathew Robinson <chasinglogic@gmail.com> | 2019-02-19 10:50:57 -0500 |
---|---|---|
committer | Mathew Robinson <chasinglogic@gmail.com> | 2019-04-08 14:08:49 -0400 |
commit | 8dd6d4755734ed37c1b98dfdefce3ca6bc65f1f6 (patch) | |
tree | 69e936c4953cbead2e3bae2690157c5fe75e709d /buildscripts/resmokelib/suitesconfig.py | |
parent | c600aa9d7423eca8151daf626e2799d9a6c7b31c (diff) | |
download | mongo-8dd6d4755734ed37c1b98dfdefce3ca6bc65f1f6.tar.gz |
SERVER-32295 Support Python 3
Diffstat (limited to 'buildscripts/resmokelib/suitesconfig.py')
-rw-r--r-- | buildscripts/resmokelib/suitesconfig.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/buildscripts/resmokelib/suitesconfig.py b/buildscripts/resmokelib/suitesconfig.py index 156f15e1413..d55ce7782dd 100644 --- a/buildscripts/resmokelib/suitesconfig.py +++ b/buildscripts/resmokelib/suitesconfig.py @@ -1,7 +1,5 @@ """Module for retrieving the configuration of resmoke.py test suites.""" -from __future__ import absolute_import - import collections import optparse import os @@ -33,7 +31,7 @@ def create_test_membership_map(fail_on_missing_selector=False, test_kind=None): """ if test_kind is not None: - if isinstance(test_kind, basestring): + if isinstance(test_kind, str): test_kind = [test_kind] test_kind = frozenset(test_kind) @@ -117,6 +115,6 @@ def _get_yaml_config(kind, pathname): pathname = resmokeconfig.NAMED_SUITES[pathname] # Expand 'pathname' to full path. if not utils.is_yaml_file(pathname) or not os.path.isfile(pathname): - raise optparse.OptionValueError("Expected a %s YAML config, but got '%s'" % (kind, - pathname)) + raise optparse.OptionValueError( + "Expected a %s YAML config, but got '%s'" % (kind, pathname)) return utils.load_yaml_file(pathname) |