diff options
author | Aaron Williamson <aaron@copiesofcopies.org> | 2011-10-03 20:01:14 -0400 |
---|---|---|
committer | Aaron Williamson <aaron@copiesofcopies.org> | 2011-10-03 20:01:14 -0400 |
commit | 43199340a25ab0aa252796f1c865e9ebf0e96649 (patch) | |
tree | 36ce24fa3992d4646d2c7835399e2eddc55f7612 /mediagoblin/gmg_commands | |
parent | 3b74ce94ff90e0bd5b214891becb62a6fc503434 (diff) | |
parent | 4d7a93a49303344830021bab5a741148b1adb7c3 (diff) | |
download | mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.lz mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.xz mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.zip |
Fixed conflict in /auth/views.py.
Diffstat (limited to 'mediagoblin/gmg_commands')
-rw-r--r-- | mediagoblin/gmg_commands/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py index 0071c65b..92ae840e 100644 --- a/mediagoblin/gmg_commands/__init__.py +++ b/mediagoblin/gmg_commands/__init__.py @@ -16,7 +16,7 @@ import argparse -from mediagoblin import util as mg_util +from mediagoblin.tools.common import import_component SUBCOMMAND_MAP = { @@ -67,8 +67,8 @@ def main_cli(): else: subparser = subparsers.add_parser(command_name) - setup_func = mg_util.import_component(command_struct['setup']) - exec_func = mg_util.import_component(command_struct['func']) + setup_func = import_component(command_struct['setup']) + exec_func = import_component(command_struct['func']) setup_func(subparser) |