Remove use of RequestContext and change render_to_response to render

apps/analyzer/views.py

@@ -3,8 +3,7 @@ from utils import log as logging
 from django.shortcuts import get_object_or_404
 from django.views.decorators.http import require_POST
 from django.conf import settings
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from mongoengine.queryset import NotUniqueError
 from apps.rss_feeds.models import Feed
 from apps.reader.models import UserSubscription
@@ -132,10 +131,10 @@ def popularity_query(request):
                                                     query=request.POST['query'])
             query.queue_email()
             
-            response = render_to_response('analyzer/popularity_query.xhtml', {
+            response = render(request, 'analyzer/popularity_query.xhtml', {
                 'success': True,
                 'popularity_query_form': form,
-            }, context_instance=RequestContext(request))
+            })
             response.set_cookie('newsblur_popularity_query', request.POST['query'])
             
             return response
@@ -145,8 +144,8 @@ def popularity_query(request):
         logging.user(request.user, "~BC~FRPopularity query form loading")
         form = PopularityQueryForm(initial={'query': request.COOKIES.get('newsblur_popularity_query', "")})
     
-    response = render_to_response('analyzer/popularity_query.xhtml', {
+    response = render(request, 'analyzer/popularity_query.xhtml', {
         'popularity_query_form': form,
-    }, context_instance=RequestContext(request))
+    })
 
     return response

apps/api/views.py

@@ -6,8 +6,7 @@ import lxml.html
 from django import forms
 from django.conf import settings
 from django.http import HttpResponse
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 from django.contrib.auth import login as login_user
 from django.contrib.auth import logout as logout_user
 from apps.reader.forms import SignupForm, LoginForm
@@ -107,7 +106,7 @@ def add_site_load_script(request, token):
     except UserSubscriptionFolders.DoesNotExist:
         code = -1
     
-    return render_to_response('api/share_bookmarklet.js', {
+    return render(request, 'api/share_bookmarklet.js', {
         'code': code,
         'token': token,
         'folders': (usf and usf.folders) or [],
@@ -117,8 +116,7 @@ def add_site_load_script(request, token):
         'error_image': error_image,
         'add_image': add_image,
         'new_folder_image': new_folder_image,
-    }, 
-    context_instance=RequestContext(request),
+    },
     content_type='application/javascript')
 
 def add_site(request, token):

apps/feed_import/views.py

@@ -12,9 +12,8 @@ from django.contrib.auth.models import User
 from django.http import HttpResponse, HttpResponseRedirect
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.template import RequestContext
 from django.contrib.auth import login as login_user
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from apps.reader.forms import SignupForm
 from apps.reader.models import UserSubscription
 from apps.feed_import.models import OAuthToken, GoogleReaderImporter

apps/mobile/views.py

@@ -3,13 +3,11 @@ import base64
 from vendor import yaml
 from django.conf import settings
 from django.http import HttpResponse
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 from apps.profile.models import Profile
 from apps.reader.models import UserSubscription, UserSubscriptionFolders
 from utils import json_functions as json
 from utils import log as logging
 
 def index(request):
-    return render_to_response('mobile/mobile_workspace.xhtml', {}, 
-                              context_instance=RequestContext(request))
+    return render('mobile/mobile_workspace.xhtml', {})

apps/profile/views.py

@@ -12,8 +12,7 @@ from django.contrib.sites.models import Site
 from django.contrib.auth.models import User
 from django.contrib.admin.views.decorators import staff_member_required
 from django.core.urlresolvers import reverse
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.core.mail import mail_admins
 from django.conf import settings
 from apps.profile.models import Profile, PaymentHistory, RNewUserQueue, MRedeemedCode, MGiftCode
@@ -97,10 +96,9 @@ def login(request):
             logging.user(form.get_user(), "~FG~BBOAuth Login~FW")
             return HttpResponseRedirect(request.POST['next'] or reverse('index'))
 
-    return render_to_response('accounts/login.html', {
+    return render('accounts/login.html', {
         'form': form,
-        'next': request.POST.get('next', "")
-    }, context_instance=RequestContext(request))
+        'next': request.POST.get('next', "")})
     
 @csrf_exempt
 def signup(request):
@@ -128,11 +126,11 @@ def signup(request):
             new_user.profile.activate_free()
             return HttpResponseRedirect(request.POST['next'] or reverse('index'))
 
-    return render_to_response('accounts/signup.html', {
+    return render(request, 'accounts/signup.html', {
         'form': form,
         'recaptcha_error': recaptcha_error,
         'next': request.POST.get('next', "")
-    }, context_instance=RequestContext(request))
+    })
 
 @login_required
 @csrf_protect
@@ -145,14 +143,13 @@ def redeem_code(request):
         if form.is_valid():
             gift_code = request.POST['gift_code']
             MRedeemedCode.redeem(user=request.user, gift_code=gift_code)
-            return render_to_response('reader/paypal_return.xhtml', 
-                                      {}, context_instance=RequestContext(request))
+            return render(request, 'reader/paypal_return.xhtml')
 
-    return render_to_response('accounts/redeem_code.html', {
+    return render(request, 'accounts/redeem_code.html', {
         'form': form,
         'code': request.POST.get('code', ""),
         'next': request.POST.get('next', "")
-    }, context_instance=RequestContext(request))
+    })
     
 
 @ajax_login_required
@@ -290,8 +287,8 @@ def paypal_form(request):
 
 def paypal_return(request):
 
-    return render_to_response('reader/paypal_return.xhtml', {
-    }, context_instance=RequestContext(request))
+    return render(request, 'reader/paypal_return.xhtml', {
+    })
     
 @login_required
 def activate_premium(request):
@@ -424,8 +421,7 @@ def stripe_form(request):
         zebra_form = StripePlusPaymentForm(email=user.email, plan=plan)
     
     if success_updating:
-        return render_to_response('reader/paypal_return.xhtml', 
-                                  {}, context_instance=RequestContext(request))
+        return render(request, 'reader/paypal_return.xhtml')
     
     new_user_queue_count = RNewUserQueue.user_count()
     new_user_queue_position = RNewUserQueue.user_position(request.user.pk)
@@ -440,7 +436,7 @@ def stripe_form(request):
     
     logging.user(request, "~BM~FBLoading Stripe form")
 
-    return render_to_response('profile/stripe_form.xhtml',
+    return render(request, 'profile/stripe_form.xhtml',
         {
           'zebra_form': zebra_form,
           'publishable': settings.STRIPE_PUBLISHABLE,
@@ -451,8 +447,7 @@ def stripe_form(request):
           'renew': renew,
           'immediate_charge': immediate_charge,
           'error': error,
-        },
-        context_instance=RequestContext(request)
+        }
     )
 
 @render_to('reader/activities_module.xhtml')

apps/reader/http.py

@@ -1,9 +1,8 @@
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 
 def respond(request, template_name, context_dict, **kwargs):
     """
     Use this function rather than render_to_response directly. The idea is to ensure
     that we're always using RequestContext. It's too easy to forget.
     """
-    return render_to_response(template_name, RequestContext(request, context_dict), **kwargs)
+    return render(request, template_name, context_dict, **kwargs)

apps/recommendations/views.py

@@ -2,8 +2,7 @@ import re
 import datetime
 from utils import log as logging
 from django.http import HttpResponse
-from django.template import RequestContext
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render, get_object_or_404
 from apps.recommendations.models import RecommendedFeed
 from apps.reader.models import UserSubscription
 from apps.rss_feeds.models import Feed, MFeedIcon
@@ -35,7 +34,7 @@ def load_recommended_feed(request):
     feed_icon = MFeedIcon.objects(feed_id=recommended_feed.feed_id)
     
     if recommended_feed:
-        return render_to_response('recommendations/render_recommended_feed.xhtml', {
+        return render(request, 'recommendations/render_recommended_feed.xhtml', {
             'recommended_feed'  : recommended_feed,
             'description'       : recommended_feed.description or recommended_feed.feed.data.feed_tagline,
             'usersub'           : usersub,
@@ -45,7 +44,7 @@ def load_recommended_feed(request):
             'unmoderated'       : unmoderated,
             'today'             : datetime.datetime.now(),
             'page'              : page,
-        }, context_instance=RequestContext(request))
+        })
     else:
         return HttpResponse("")
         

apps/rss_feeds/views.py

@@ -1,12 +1,11 @@
 import datetime
 from urlparse import urlparse
 from utils import log as logging
-from django.shortcuts import get_object_or_404, render_to_response
+from django.shortcuts import get_object_or_404, render
 from django.views.decorators.http import condition
 from django.http import HttpResponseForbidden, HttpResponseRedirect, HttpResponse, Http404
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
-from django.template import RequestContext
 # from django.db import IntegrityError
 from apps.rss_feeds.models import Feed, merge_feeds
 from apps.rss_feeds.models import MFetchHistory
@@ -174,11 +173,11 @@ def load_feed_statistics_embedded(request, feed_id):
     
     logging.user(request, "~FBStatistics (~FCembedded~FB): ~SB%s" % (feed))
     
-    return render_to_response('rss_feeds/statistics.xhtml', {
+    return render(request, 'rss_feeds/statistics.xhtml', {
         'stats': json.json_encode(stats),
         'feed_js': json.json_encode(feed.canonical()),
         'feed': feed,
-    }, context_instance=RequestContext(request))    
+    }    
     
 def assemble_statistics(user, feed_id):
     timezone = user.profile.timezone
@@ -505,9 +504,9 @@ def status(request):
     now      = datetime.datetime.now()
     hour_ago = now - datetime.timedelta(minutes=minutes)
     feeds    = Feed.objects.filter(last_update__gte=hour_ago).order_by('-last_update')
-    return render_to_response('rss_feeds/status.xhtml', {
+    return render(request, 'rss_feeds/status.xhtml', {
         'feeds': feeds
-    }, context_instance=RequestContext(request))
+    })
 
 @json.json_view
 def original_text(request):

apps/social/views.py

@@ -5,14 +5,13 @@ import random
 import re
 from bson.objectid import ObjectId
 from mongoengine.queryset import NotUniqueError
-from django.shortcuts import get_object_or_404, render_to_response
+from django.shortcuts import get_object_or_404, render
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.template.loader import render_to_string
 from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponseForbidden
 from django.conf import settings
-from django.template import RequestContext
 from django.utils import feedgenerator
 from apps.rss_feeds.models import MStory, Feed, MStarredStory
 from apps.social.models import MSharedStory, MSocialServices, MSocialProfile, MSocialSubscription, MCommentReply
@@ -424,7 +423,7 @@ def load_social_page(request, user_id, username=None, **kwargs):
             'user_following_social_profile': user_following_social_profile,
         }
         template = 'social/social_page.xhtml'
-        return render_to_response(template, params, context_instance=RequestContext(request))
+        return render(request, template, params)
 
     story_feed_ids = list(set(s['story_feed_id'] for s in stories))
     feeds = Feed.objects.filter(pk__in=story_feed_ids)
@@ -506,7 +505,7 @@ def load_social_page(request, user_id, username=None, **kwargs):
     else:
         template = 'social/social_page.xhtml'
         
-    return render_to_response(template, params, context_instance=RequestContext(request))
+    return render(request, template, params)
 
 @required_params('story_id', feed_id=int)
 def story_public_comments(request):
@@ -532,9 +531,9 @@ def story_public_comments(request):
     
     if format == 'html':
         stories = MSharedStory.attach_users_to_stories(stories, profiles)
-        return render_to_response('social/story_comments.xhtml', {
+        return render(request, 'social/story_comments.xhtml', {
             'story': stories[0],
-        }, context_instance=RequestContext(request))
+        })
     else:
         return json.json_response(request, {
             'comments': stories[0]['public_comments'], 
@@ -674,9 +673,9 @@ def mark_story_as_shared(request):
     
     if format == 'html':
         stories = MSharedStory.attach_users_to_stories(stories, profiles)
-        return render_to_response('social/social_story.xhtml', {
+        return render(request, 'social/social_story.xhtml', {
             'story': story,
-        }, context_instance=RequestContext(request))
+        })
     else:
         return json.json_response(request, {
             'code': code, 
@@ -715,9 +714,9 @@ def mark_story_as_unshared(request):
 
     if format == 'html':
         stories = MSharedStory.attach_users_to_stories(stories, profiles)
-        return render_to_response('social/social_story.xhtml', {
+        return render(request, 'social/social_story.xhtml', {
             'story': stories[0],
-        }, context_instance=RequestContext(request))
+        })
     else:
         return json.json_response(request, {
             'code': 1, 
@@ -823,9 +822,9 @@ def save_comment_reply(request):
     
     if format == 'html':
         comment = MSharedStory.attach_users_to_comment(comment, profiles)
-        return render_to_response('social/story_comment.xhtml', {
+        return render(request, 'social/story_comment.xhtml', {
             'comment': comment,
-        }, context_instance=RequestContext(request))
+        })
     else:
         return json.json_response(request, {
             'code': code, 
@@ -887,9 +886,9 @@ def remove_comment_reply(request):
     
     if format == 'html':
         comment = MSharedStory.attach_users_to_comment(comment, profiles)
-        return render_to_response('social/story_comment.xhtml', {
+        return render(request, 'social/story_comment.xhtml', {
             'comment': comment,
-        }, context_instance=RequestContext(request))
+        })
     else:
         return json.json_response(request, {
             'code': code, 
@@ -1252,9 +1251,9 @@ def like_comment(request):
                                        
     if format == 'html':
         comment = MSharedStory.attach_users_to_comment(comment, profiles)
-        return render_to_response('social/story_comment.xhtml', {
+        return render(request, 'social/story_comment.xhtml', {
             'comment': comment,
-        }, context_instance=RequestContext(request))
+        })
     else:
         return json.json_response(request, {
             'code': code, 
@@ -1283,9 +1282,9 @@ def remove_like_comment(request):
     
     if format == 'html':
         comment = MSharedStory.attach_users_to_comment(comment, profiles)
-        return render_to_response('social/story_comment.xhtml', {
+        return render(request, 'social/story_comment.xhtml', {
             'comment': comment,
-        }, context_instance=RequestContext(request))
+        })
     else:
         return json.json_response(request, {
             'code': code, 
@@ -1450,8 +1449,7 @@ def load_interactions(request):
     logging.user(request, "~FBLoading interactions ~SBp/%s" % page)
     
     if format == 'html':
-        return render_to_response('reader/interactions_module.xhtml', data,
-                                  context_instance=RequestContext(request))
+        return render(request, 'reader/interactions_module.xhtml', data)
     else:
         return json.json_response(request, data)
 
@@ -1483,8 +1481,8 @@ def load_activities(request):
     logging.user(request, "~FBLoading activities ~SBp/%s" % page)
     
     if format == 'html':
-        return render_to_response('reader/activities_module.xhtml', data,
-                                  context_instance=RequestContext(request))
+        return render(request, 'reader/activities_module.xhtml', data,
+                                  )
     else:
         return json.json_response(request, data)
 

apps/static/views.py

@@ -3,48 +3,38 @@ import yaml
 import redis
 from django.conf import settings
 from django.http import HttpResponse
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 from apps.rss_feeds.models import Feed, MStory
 from apps.search.models import SearchFeed
 from utils import log as logging
 
 def about(request):
-    return render_to_response('static/about.xhtml', {}, 
-                              context_instance=RequestContext(request))
+    return render(request, 'static/about.xhtml')
                               
 def faq(request):
-    return render_to_response('static/faq.xhtml', {}, 
-                              context_instance=RequestContext(request))
+    return render(request, 'static/faq.xhtml')
                               
 def api(request):
     filename     = settings.TEMPLATE_DIRS[0] + '/static/api.yml'
     api_yml_file = open(filename).read()
     data         = yaml.load(api_yml_file)
 
-    return render_to_response('static/api.xhtml', {
-        'data': data
-    }, context_instance=RequestContext(request))
+    return render(request, 'static/api.xhtml', {'data': data})
                               
 def press(request):
-    return render_to_response('static/press.xhtml', {}, 
-                              context_instance=RequestContext(request))
+    return render(request, 'static/press.xhtml')
 
 def privacy(request):
-    return render_to_response('static/privacy.xhtml', {}, 
-                              context_instance=RequestContext(request))
+    return render(request, 'static/privacy.xhtml')
 
 def tos(request):
-    return render_to_response('static/tos.xhtml', {}, 
-                              context_instance=RequestContext(request))
+    return render(request, 'static/tos.xhtml')
                         
 def apple_app_site_assoc(request):
-    return render_to_response('static/apple_app_site_assoc.xhtml', {}, 
-                              context_instance=RequestContext(request))
+    return render(request, 'static/apple_app_site_assoc.xhtml')
                                                       
 def feedback(request):
-    return render_to_response('static/feedback.xhtml', {}, 
-                              context_instance=RequestContext(request))
+    return render(request, 'static/feedback.xhtml')
 
 def firefox(request):
     filename = settings.MEDIA_ROOT + '/extensions/firefox/manifest.json'
@@ -53,16 +43,13 @@ def firefox(request):
     return HttpResponse(manifest, content_type='application/x-web-app-manifest+json')
 
 def ios(request):
-    return render_to_response('static/ios.xhtml', {},
-                              context_instance=RequestContext(request))
+    return render(request, 'static/ios.xhtml')
     
 def android(request):
-    return render_to_response('static/android.xhtml', {},
-                              context_instance=RequestContext(request))
+    return render(request, 'static/android.xhtml')
     
 def ios_download(request):
-    return render_to_response('static/ios_download.xhtml', {},
-                              context_instance=RequestContext(request))
+    return render(request, 'static/ios_download.xhtml')
                               
 def ios_plist(request):
     filename = os.path.join(settings.NEWSBLUR_DIR, 'clients/ios/NewsBlur.plist')

apps/statistics/views.py

@@ -1,7 +1,6 @@
 import datetime
 from django.http import HttpResponse
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.utils import feedgenerator
 from apps.statistics.models import MStatistics, MFeedback
 from apps.profile.models import PaymentHistory
@@ -10,15 +9,19 @@ from utils import log as logging
 
 def dashboard_graphs(request):
     statistics = MStatistics.all()
-    return render_to_response('statistics/render_statistics_graphs.xhtml', {
-        'statistics': statistics,
-    }, context_instance=RequestContext(request))
+    return render(
+        request,
+        'statistics/render_statistics_graphs.xhtml', 
+        {'statistics': statistics}
+    )
 
 def feedback_table(request):
     feedbacks = MFeedback.all()
-    return render_to_response('statistics/render_feedback_table.xhtml', {
-        'feedbacks': feedbacks,
-    }, context_instance=RequestContext(request))
+    return render(
+        request, 
+        'statistics/render_feedback_table.xhtml',
+        {'feedbacks': feedbacks}
+    )
 
 def revenue(request):
     data = {}

utils/view_functions.py

@@ -1,5 +1,4 @@
 from django.http import Http404, HttpResponse
-from django.template import RequestContext
 from django.shortcuts import render_to_response
 from utils import json_functions as json
 import functools
@@ -15,8 +14,7 @@ def get_argument_or_404(request, param, method='REQUEST', code='404'):
         
 def render_to(template):
     """
-    Decorator for Django views that sends returned dict to render_to_response function
-    with given template and RequestContext as context instance.
+    Decorator for Django views that sends returned dict to render function.
 
     If view doesn't return dict then decorator simply returns output.
     Additionally view can return two-tuple, which must contain dict as first
@@ -31,9 +29,9 @@ def render_to(template):
         def wrapper(request, *args, **kw):
             output = func(request, *args, **kw)
             if isinstance(output, (list, tuple)):
-                return render_to_response(output[1], output[0], RequestContext(request))
+                return render(request, output[1], output[0])
             elif isinstance(output, dict):
-                return render_to_response(template, output, RequestContext(request))
+                return render(request, template, output)
             return output
         return wrapper
     return renderer

vendor/paypal/standard/pdt/views.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.views.decorators.http import require_GET
 from paypal.standard.pdt.models import PayPalPDT
 from paypal.standard.pdt.forms import PayPalPDTForm
@@ -16,7 +15,7 @@ def pdt(request, item_check_callable=None, template="pdt/pdt.html", context=None
 
     context = context or {}
     context.update({"failed": failed, "pdt_obj": pdt_obj})
-    return render_to_response(template, context, RequestContext(request))
+    return render(request, template, context)
 
 
 def process_pdt(request, item_check_callable=None):