From 7d8d5d075a635157aedeb39b7ef0f6a36c1a3a81 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Tue, 17 Jan 2017 10:57:20 -0800 Subject: [PATCH] Replace new.module with types.ModuleType "import new" is gone in Python 3 --- .../buildbot/test/unit/test_worker_transition.py | 14 +++++++------- master/buildbot/test/unit/test_www_ldapuserinfo.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/master/buildbot/test/unit/test_worker_transition.py b/master/buildbot/test/unit/test_worker_transition.py index fef7cd3c4d3..fbbea23da8d 100644 --- a/master/buildbot/test/unit/test_worker_transition.py +++ b/master/buildbot/test/unit/test_worker_transition.py @@ -16,9 +16,9 @@ from __future__ import absolute_import from __future__ import print_function -import new import re import sys +import types import mock @@ -64,7 +64,7 @@ class Test_deprecatedWorkerModuleAttribute(unittest.TestCase): def test_produces_warning(self): Worker = type("Worker", (object,), {}) - buildbot_module = new.module('buildbot_module') + buildbot_module = types.ModuleType('buildbot_module') buildbot_module.Worker = Worker with mock.patch.dict(sys.modules, {'buildbot_module': buildbot_module}): @@ -86,7 +86,7 @@ def test_produces_warning(self): self.assertIdentical(S, Worker) def test_not_catched_warning(self): - buildbot_module = new.module('buildbot_module') + buildbot_module = types.ModuleType('buildbot_module') buildbot_module.deprecated_attr = 1 with mock.patch.dict(sys.modules, {'buildbot_module': buildbot_module}): @@ -111,7 +111,7 @@ def test_not_catched_warning(self): def test_explicit_compat_name(self): Worker = type("Worker", (object,), {}) - buildbot_module = new.module('buildbot_module') + buildbot_module = types.ModuleType('buildbot_module') buildbot_module.Worker = Worker with mock.patch.dict(sys.modules, {'buildbot_module': buildbot_module}): @@ -135,7 +135,7 @@ def test_explicit_compat_name(self): def test_explicit_new_name(self): BuildSlave = type("BuildSlave", (object,), {}) - buildbot_module = new.module('buildbot_module') + buildbot_module = types.ModuleType('buildbot_module') buildbot_module.BuildSlave = BuildSlave with mock.patch.dict(sys.modules, {'buildbot_module': buildbot_module}): @@ -157,7 +157,7 @@ def test_explicit_new_name(self): def test_explicit_new_name_empty(self): BuildSlave = type("BuildSlave", (object,), {}) - buildbot_module = new.module('buildbot_module') + buildbot_module = types.ModuleType('buildbot_module') buildbot_module.BuildSlave = BuildSlave with mock.patch.dict(sys.modules, {'buildbot_module': buildbot_module}): @@ -180,7 +180,7 @@ def test_explicit_new_name_empty(self): def test_module_reload(self): Worker = type("Worker", (object,), {}) - buildbot_module = new.module('buildbot_module') + buildbot_module = types.ModuleType('buildbot_module') buildbot_module.Worker = Worker with mock.patch.dict(sys.modules, {'buildbot_module': buildbot_module}): diff --git a/master/buildbot/test/unit/test_www_ldapuserinfo.py b/master/buildbot/test/unit/test_www_ldapuserinfo.py index ed564da327e..381fb3f3630 100644 --- a/master/buildbot/test/unit/test_www_ldapuserinfo.py +++ b/master/buildbot/test/unit/test_www_ldapuserinfo.py @@ -18,15 +18,15 @@ from __future__ import print_function from future.builtins import range -import new import sys +import types import mock from twisted.internet import defer from twisted.trial import unittest -fake_ldap = new.module('ldap3') +fake_ldap = types.ModuleType('ldap3') fake_ldap.SEARCH_SCOPE_WHOLE_SUBTREE = 2 with mock.patch.dict(sys.modules, {'ldap3': fake_ldap}): from buildbot.www import ldapuserinfo