← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/services/scripts/base.py

  • Committer: Leonard Richardson
  • Date: 2011-03-23 16:28:51 UTC
  • mfrom: (12651 devel)
  • mto: This revision was merged to the branch mainline in revision 12658.
  • Revision ID: leonard.richardson@canonical.com-20110323162851-01ufg6po3a2uyspm
Merge from trunk and resolve mysterious conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/services/scripts/base.py
1
 
# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 
1
# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
2
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3
3
 
4
4
__metaclass__ = type
40
40
    )
41
41
from canonical.lp import initZopeless
42
42
from lp.services.features import (
43
 
    getFeatureFlag,
44
43
    get_relevant_feature_controller,
45
44
    install_feature_controller,
46
45
    make_script_feature_controller,