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/submit/views.py | |
| 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/submit/views.py')
| -rw-r--r-- | mediagoblin/submit/views.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index e24d78f3..7134235e 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -22,10 +22,9 @@ from cgi import FieldStorage from werkzeug.utils import secure_filename from mediagoblin.db.util import ObjectId -from mediagoblin.util import ( - render_to_response, redirect, cleaned_markdown_conversion, \ - convert_to_tag_list_of_dicts) -from mediagoblin.util import pass_to_ugettext as _ +from mediagoblin.tools.text import cleaned_markdown_conversion, convert_to_tag_list_of_dicts +from mediagoblin.tools.translate import pass_to_ugettext as _ +from mediagoblin.tools.response import render_to_response, redirect from mediagoblin.decorators import require_active_login from mediagoblin.submit import forms as submit_forms, security from mediagoblin.process_media import process_media, mark_entry_failed |