← Back to branch summary

~zyga/checkbox/fix-1444996

« back to all changes in this revision

Viewing changes to checkbox-touch/py/checkbox_touch.py

  • Committer: Zygmunt Krynicki
  • Date: 2015-04-14 19:43:59 UTC
  • mto: This revision was merged to the branch mainline in revision 3692.
  • Revision ID: zygmunt.krynicki@canonical.com-20150414194359-7uhz2m2rn3usknr7
checkbox-touch:py: use get_providers()

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
checkbox-touch/py/checkbox_touch.py
47
47
from plainbox.impl.applogic import PlainBoxConfig
48
48
from plainbox.impl.clitools import ToolBase
49
49
from plainbox.impl.exporter import get_all_exporters
50
 
from plainbox.impl.providers.special import get_categories
51
 
from plainbox.impl.providers.special import get_stubbox
52
 
from plainbox.impl.providers.v1 import all_providers
53
 
from embedded_providers import EmbeddedProvider1PlugInCollection
54
50
from plainbox.impl.runner import JobRunner
55
51
from plainbox.impl.secure.origin import Origin
56
52
from plainbox.impl.secure.qualifiers import FieldQualifier
63
59
from plainbox.impl.session.storage import SessionStorageRepository
64
60
from plainbox.impl.unit.job import JobDefinition
65
61
from plainbox.impl.unit.validators import compute_value_map
 
62
from plainbox.public import get_providers
66
63
import plainbox
67
64
 
 
65
from embedded_providers import EmbeddedProvider1PlugInCollection
 
66
 
68
67
_logger = logging.getLogger('checkbox.touch')
69
68
_manager = None
70
69
 
780
779
        :returns:
781
780
            list of loaded providers
782
781
        """
783
 
        all_providers.load()
784
 
        provider_list = all_providers.get_all_plugin_objects()
 
782
        provider_list = get_providers()
785
783
        # when running on ubuntu-touch device, APP_DIR env var is present
786
784
        # and points to touch application top directory
787
785
        app_root_dir = os.path.normpath(os.getenv(
792
790
        if os.path.exists(path):
793
791
            embedded_providers = EmbeddedProvider1PlugInCollection(path)
794
792
            provider_list += embedded_providers.get_all_plugin_objects()
795
 
        provider_list.append(get_categories())
796
793
        return provider_list
797
794
 
798
795