differenced.sort()
pages.extend(differenced)
to_return = {
+ 'MEDIA_URL': settings.MEDIA_URL,
+ 'STATIC_URL': getattr(settings, "STATIC_URL", None),
'pages': pages,
'page_obj': page_obj,
'paginator': paginator,
else:
to_return['getvars'] = ''
return to_return
- except KeyError, AttributeError:
+ except (KeyError, AttributeError):
return {}