summaryrefslogtreecommitdiff
path: root/app/lib
diff options
context:
space:
mode:
authorlxf <lxf@d1stkfactory>2014-05-21 18:21:03 +0000
committerlxf <lxf@d1stkfactory>2014-05-21 18:21:03 +0000
commitf787e348df5aae0d53053b3e4cce3fb1ffbeccb2 (patch)
tree7976b716ae74cfec10e0f85481b2116b7799149e /app/lib
parent750746d3d6f3cd297902a8d8ccd5d7519a9956e0 (diff)
additional fixes to run under python 3.2
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/pagination/templatetags/pagination_tags.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/lib/pagination/templatetags/pagination_tags.py b/app/lib/pagination/templatetags/pagination_tags.py
index dd47009..75c23f6 100644
--- a/app/lib/pagination/templatetags/pagination_tags.py
+++ b/app/lib/pagination/templatetags/pagination_tags.py
@@ -50,17 +50,17 @@ def do_autopaginate(parser, token):
try:
paginate_by = int(split[2])
except ValueError:
- raise template.TemplateSyntaxError(u'Got %s, but expected integer.' % split[2])
+ raise template.TemplateSyntaxError('Got %s, but expected integer.' % split[2])
return AutoPaginateNode(split[1], paginate_by=paginate_by)
elif len(split) == 4:
try:
paginate_by = int(split[2])
except ValueError:
- raise template.TemplateSyntaxError(u'Got %s, but expected integer.' % split[2])
+ raise template.TemplateSyntaxError('Got %s, but expected integer.' % split[2])
try:
orphans = int(split[3])
except ValueError:
- raise template.TemplateSyntaxError(u'Got %s, but expected integer.' % split[3])
+ raise template.TemplateSyntaxError('Got %s, but expected integer.' % split[3])
return AutoPaginateNode(split[1], paginate_by=paginate_by, orphans=orphans)
else:
raise template.TemplateSyntaxError('%r tag takes one required argument and one optional argument' % split[0])
@@ -105,7 +105,7 @@ class AutoPaginateNode(template.Node):
try:
model = value[0].__class__
except IndexError:
- return u''
+ return ''
paginator_class = Paginator
paginator = paginator_class(value, self.paginate_by, self.orphans)
try:
@@ -113,13 +113,13 @@ class AutoPaginateNode(template.Node):
except InvalidPage:
context[key] = []
context['invalid_page'] = True
- return u''
+ return ''
context[key] = page_obj.object_list
context['paginator'] = paginator
context['page_obj'] = page_obj
if hasattr(context['request'], 'page_url'):
context['use_page_path'] = True
- return u''
+ return ''
def paginate(context, window=DEFAULT_WINDOW):
"""