From 19114d1073e5a3b4529189bad6cd6e92805f549b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 2 Mar 2015 13:01:13 +0100 Subject: [PATCH] Use fully qualified import for plugin manager in file manager to simplify unit testing --- src/octoprint/filemanager/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/octoprint/filemanager/__init__.py b/src/octoprint/filemanager/__init__.py index 85e1931c..dfab1da8 100644 --- a/src/octoprint/filemanager/__init__.py +++ b/src/octoprint/filemanager/__init__.py @@ -8,8 +8,9 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms import logging import os +import octoprint.plugin + from octoprint.events import eventManager, Events -from octoprint.plugin import plugin_manager, ProgressPlugin from .destinations import FileDestinations from .analysis import QueueEntry, AnalysisQueue @@ -114,7 +115,7 @@ class FileManager(object): self._slicing_progress_callbacks = [] self._last_slicing_progress = None - self._progress_plugins = plugin_manager().get_implementations(ProgressPlugin) + self._progress_plugins = octoprint.plugin.plugin_manager().get_implementations(octoprint.plugin.ProgressPlugin) for storage_type, storage_manager in self._storage_managers.items(): self._determine_analysis_backlog(storage_type, storage_manager)