diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-18 09:34:09 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-18 09:34:09 -0600 |
| commit | 817066506d846d06d0489dfb42b8200b86f61153 (patch) | |
| tree | 36578ed7e5b2b205c919fcfb8929c8fc33a79c3f /mediagoblin/gmg_commands/__init__.py | |
| parent | 76c6c806caec7af20a3fe11c04bb783baacc3934 (diff) | |
| parent | 3618a9ac5112c657fd095a0f9cbd346921a4e800 (diff) | |
| download | mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.lz mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.xz mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/user.html
Diffstat (limited to 'mediagoblin/gmg_commands/__init__.py')
| -rw-r--r-- | mediagoblin/gmg_commands/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py index 10c30385..04187ff2 100644 --- a/mediagoblin/gmg_commands/__init__.py +++ b/mediagoblin/gmg_commands/__init__.py @@ -29,7 +29,7 @@ SUBCOMMAND_MAP = { 'setup': 'mediagoblin.gmg_commands.migrate:migrate_parser_setup', 'func': 'mediagoblin.gmg_commands.migrate:migrate', 'help': 'Apply all unapplied bulk migrations to the database'}, - 'adduser':{ + 'adduser': { 'setup': 'mediagoblin.gmg_commands.users:adduser_parser_setup', 'func': 'mediagoblin.gmg_commands.users:adduser', 'help': 'Creates an user'}, @@ -68,7 +68,7 @@ def main_cli(): subparsers = parser.add_subparsers(help='sub-command help') for command_name, command_struct in SUBCOMMAND_MAP.iteritems(): - if command_struct.has_key('help'): + if 'help' in command_struct: subparser = subparsers.add_parser( command_name, help=command_struct['help']) else: @@ -94,4 +94,3 @@ def main_cli(): if __name__ == '__main__': main_cli() - |