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/user_pages/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/user_pages/views.py')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 6a82d718..9cec74dc 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -18,10 +18,11 @@ from webob import exc from mediagoblin import messages, mg_globals from mediagoblin.db.util import DESCENDING, ObjectId -from mediagoblin.util import ( - Pagination, render_to_response, redirect, cleaned_markdown_conversion, - render_404, delete_media_files) -from mediagoblin.util import pass_to_ugettext as _ +from mediagoblin.tools.text import cleaned_markdown_conversion +from mediagoblin.tools.response import render_to_response, render_404, redirect +from mediagoblin.tools.translate import pass_to_ugettext as _ +from mediagoblin.tools.pagination import Pagination +from mediagoblin.tools.files import delete_media_files from mediagoblin.user_pages import forms as user_forms from mediagoblin.decorators import (uses_pagination, get_user_media_entry, |