aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/views.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-10-01 21:27:36 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-10-01 21:27:36 -0500
commitb43b17fc2686f5524413a66f8e98f3ab0cc11a60 (patch)
tree36fb9cf3155a2ff715b1e93f29be6a17cb2113e9 /mediagoblin/views.py
parente27396802caaab9a939c56d19c991339157c493f (diff)
parent91e42c467d898ef70dec2d2d34e4173ea771d2ed (diff)
downloadmediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.tar.lz
mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.tar.xz
mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.zip
Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'
Conflicts: mediagoblin/util.py
Diffstat (limited to 'mediagoblin/views.py')
-rw-r--r--mediagoblin/views.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 96687f96..22f9268d 100644
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -15,7 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from mediagoblin import mg_globals
-from mediagoblin.util import render_to_response, Pagination
+from mediagoblin.tools.pagination import Pagination
+from mediagoblin.tools.response import render_to_response
from mediagoblin.db.util import DESCENDING
from mediagoblin.decorators import uses_pagination