Refactor, use context.messenger directly

Instead of having methods in Context forward calls on to the Messenger,
have folks call the Messenger directly. Remove the forwarding methods in
Context.

7 files changed, 17 insertions, 17 deletions

diff --git a/tests/artifactcache/pull.py b/tests/artifactcache/pull.py
index b42af9e6e..a4ea74633 100644
--- a/tests/artifactcache/pull.py
+++ b/tests/artifactcache/pull.py
@@ -95,7 +95,7 @@ def test_pull(cli, tmpdir, datafiles):
         # Fake minimal context
         context = Context()
         context.load(config=user_config_file)
-        context.set_message_handler(message_handler)
+        context.messenger.set_message_handler(message_handler)
 
         # Load the project
         project = Project(project_dir, context)
@@ -136,7 +136,7 @@ def _test_pull(user_config_file, project_dir, cache_dir,
     context.cachedir = cache_dir
     context.casdir = os.path.join(cache_dir, 'cas')
     context.tmpdir = os.path.join(cache_dir, 'tmp')
-    context.set_message_handler(message_handler)
+    context.messenger.set_message_handler(message_handler)
 
     # Load the project manually
     project = Project(project_dir, context)
@@ -198,7 +198,7 @@ def test_pull_tree(cli, tmpdir, datafiles):
         # Fake minimal context
         context = Context()
         context.load(config=user_config_file)
-        context.set_message_handler(message_handler)
+        context.messenger.set_message_handler(message_handler)
 
         # Load the project and CAS cache
         project = Project(project_dir, context)
@@ -273,7 +273,7 @@ def _test_push_tree(user_config_file, project_dir, artifact_digest, queue):
     # Fake minimal context
     context = Context()
     context.load(config=user_config_file)
-    context.set_message_handler(message_handler)
+    context.messenger.set_message_handler(message_handler)
 
     # Load the project manually
     project = Project(project_dir, context)
@@ -308,7 +308,7 @@ def _test_pull_tree(user_config_file, project_dir, artifact_digest, queue):
     # Fake minimal context
     context = Context()
     context.load(config=user_config_file)
-    context.set_message_handler(message_handler)
+    context.messenger.set_message_handler(message_handler)
 
     # Load the project manually
     project = Project(project_dir, context)
diff --git a/tests/artifactcache/push.py b/tests/artifactcache/push.py
index 996091fca..a54c1df09 100644
--- a/tests/artifactcache/push.py
+++ b/tests/artifactcache/push.py
@@ -71,7 +71,7 @@ def test_push(cli, tmpdir, datafiles):
         # Fake minimal context
         context = Context()
         context.load(config=user_config_file)
-        context.set_message_handler(message_handler)
+        context.messenger.set_message_handler(message_handler)
 
         # Load the project manually
         project = Project(project_dir, context)
@@ -108,7 +108,7 @@ def _test_push(user_config_file, project_dir, element_name, queue):
     # Fake minimal context
     context = Context()
     context.load(config=user_config_file)
-    context.set_message_handler(message_handler)
+    context.messenger.set_message_handler(message_handler)
 
     # Load the project manually
     project = Project(project_dir, context)
@@ -194,7 +194,7 @@ def _test_push_message(user_config_file, project_dir, queue):
     # Fake minimal context
     context = Context()
     context.load(config=user_config_file)
-    context.set_message_handler(message_handler)
+    context.messenger.set_message_handler(message_handler)
 
     # Load the project manually
     project = Project(project_dir, context)
diff --git a/tests/internals/loader.py b/tests/internals/loader.py
index f0b4f2622..a4ebdb9ac 100644
--- a/tests/internals/loader.py
+++ b/tests/internals/loader.py
@@ -20,7 +20,7 @@ def dummy_handler(message, is_silenced):
 def make_loader(basedir):
     context = Context()
     context.load(config=os.devnull)
-    context.set_message_handler(dummy_handler)
+    context.messenger.set_message_handler(dummy_handler)
     project = Project(basedir, context)
     return project.loader
 
diff --git a/tests/internals/pluginloading.py b/tests/internals/pluginloading.py
index fa0b9afe8..9093680f4 100644
--- a/tests/internals/pluginloading.py
+++ b/tests/internals/pluginloading.py
@@ -22,7 +22,7 @@ def create_pipeline(tmpdir, basedir, target):
     def dummy_handler(message, is_silenced):
         pass
 
-    context.set_message_handler(dummy_handler)
+    context.messenger.set_message_handler(dummy_handler)
 
     pipeline = Pipeline(context, project, None)
     targets, = pipeline.load([(target,)])
diff --git a/tests/sourcecache/fetch.py b/tests/sourcecache/fetch.py
index d7145d7f4..3fc9d96a6 100644
--- a/tests/sourcecache/fetch.py
+++ b/tests/sourcecache/fetch.py
@@ -71,7 +71,7 @@ def test_source_fetch(cli, tmpdir, datafiles):
 
         context = Context()
         context.load(config=user_config_file)
-        context.set_message_handler(message_handler)
+        context.messenger.set_message_handler(message_handler)
 
         project = Project(project_dir, context)
         project.ensure_fully_loaded()
@@ -146,7 +146,7 @@ def test_fetch_fallback(cli, tmpdir, datafiles):
 
         context = Context()
         context.load(config=user_config_file)
-        context.set_message_handler(message_handler)
+        context.messenger.set_message_handler(message_handler)
 
         project = Project(project_dir, context)
         project.ensure_fully_loaded()
@@ -204,7 +204,7 @@ def test_pull_fail(cli, tmpdir, datafiles):
         # get the source object
         context = Context()
         context.load(config=user_config_file)
-        context.set_message_handler(message_handler)
+        context.messenger.set_message_handler(message_handler)
         project = Project(project_dir, context)
         project.ensure_fully_loaded()
 
diff --git a/tests/sourcecache/push.py b/tests/sourcecache/push.py
index af4e262f0..6282b6e60 100644
--- a/tests/sourcecache/push.py
+++ b/tests/sourcecache/push.py
@@ -72,7 +72,7 @@ def test_source_push(cli, tmpdir, datafiles):
         # get the source object
         context = Context()
         context.load(config=user_config_file)
-        context.set_message_handler(message_handler)
+        context.messenger.set_message_handler(message_handler)
         project = Project(project_dir, context)
         project.ensure_fully_loaded()
 
diff --git a/tests/sourcecache/staging.py b/tests/sourcecache/staging.py
index cffd0bb58..9dc431bda 100644
--- a/tests/sourcecache/staging.py
+++ b/tests/sourcecache/staging.py
@@ -63,7 +63,7 @@ def test_source_staged(tmpdir, cli, datafiles):
     project = Project(project_dir, context)
     project.ensure_fully_loaded()
     context.cachedir = cachedir
-    context.set_message_handler(dummy_message_handler)
+    context.messenger.set_message_handler(dummy_message_handler)
     sourcecache = context.sourcecache
     cas = context.get_cascache()
 
@@ -106,7 +106,7 @@ def test_source_fetch(tmpdir, cli, datafiles):
     project = Project(project_dir, context)
     project.ensure_fully_loaded()
     context.cachedir = cachedir
-    context.set_message_handler(dummy_message_handler)
+    context.messenger.set_message_handler(dummy_message_handler)
     cas = context.get_cascache()
 
     res = cli.run(project=project_dir, args=["source", "fetch", "import-dev.bst"])
@@ -148,7 +148,7 @@ def test_staged_source_build(tmpdir, datafiles, cli):
     project = Project(project_dir, context)
     project.ensure_fully_loaded()
     context.cachedir = cachedir
-    context.set_message_handler(dummy_message_handler)
+    context.messenger.set_message_handler(dummy_message_handler)
 
     element = project.load_elements(["import-dev.bst"])[0]