diff options
author | Michal Wajszczuk <wajszczuk.m@gmail.com> | 2017-02-16 19:41:51 +0100 |
---|---|---|
committer | Michal Wajszczuk <wajszczuk.m@gmail.com> | 2017-02-16 20:28:17 +0100 |
commit | fb0b90646ec86ced32d146ee42e25f4cd72d2229 (patch) | |
tree | c59e67d0781d0c7cee8aa7d65916f5d5da0448e9 /testing/test_conftest.py | |
parent | da828aac055a65a2127ba4208d973be6d4150a31 (diff) | |
download | pytest-fb0b90646ec86ced32d146ee42e25f4cd72d2229.tar.gz |
New-style classes implemented for python 2.7 - #2147
Diffstat (limited to 'testing/test_conftest.py')
-rw-r--r-- | testing/test_conftest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testing/test_conftest.py b/testing/test_conftest.py index c0fa74701..e9fd1927a 100644 --- a/testing/test_conftest.py +++ b/testing/test_conftest.py @@ -24,14 +24,14 @@ def ConftestWithSetinitial(path): return conftest def conftest_setinitial(conftest, args, confcutdir=None): - class Namespace: + class Namespace(object): def __init__(self): self.file_or_dir = args self.confcutdir = str(confcutdir) self.noconftest = False conftest._set_initial_conftests(Namespace()) -class TestConftestValueAccessGlobal: +class TestConftestValueAccessGlobal(object): def test_basic_init(self, basedir): conftest = PytestPluginManager() p = basedir.join("adir") @@ -265,7 +265,7 @@ def test_conftest_found_with_double_dash(testdir): """) -class TestConftestVisibility: +class TestConftestVisibility(object): def _setup_tree(self, testdir): # for issue616 # example mostly taken from: # https://mail.python.org/pipermail/pytest-dev/2014-September/002617.html @@ -398,7 +398,7 @@ def test_search_conftest_up_to_inifile(testdir, confcutdir, passed, error): def test_issue1073_conftest_special_objects(testdir): testdir.makeconftest(""" - class DontTouchMe: + class DontTouchMe(object): def __getattr__(self, x): raise Exception('cant touch me') |