reorg checkpoint 2

Author: humanalgorithm

homepage/urls.py

@@ -1,26 +1,21 @@
-from django.conf.urls import patterns,include, url
-from django.contrib.auth.models import User
-
+from django.conf.urls import url
 
 from django.contrib import admin
 admin.autodiscover()
-
 from django.conf import settings
 from django.conf.urls.static import static
-from rest_framework.urlpatterns import format_suffix_patterns
 
-urlpatterns = patterns('',
+from . import views
 
-         url(r'^$', 'homepage.views.home', name="home"),
-         url(r'^learnmore/$', 'homepage.views.learnmore', name="learnmore"),
-         url(r'^about-us/$', 'homepage.views.aboutus', name="aboutus"),
-         url(r'^pythonabout/$', 'homepage.views.pythonabout'),
-         url(r'^.*/$', 'homepage.views.fourzerofour')
-)
+urlpatterns = [url(r'^$', views.home, name="home"),
+               url(r'^learnmore/$', views.learnmore, name="learnmore"),
+               url(r'^about-us/$', views.aboutus, name="aboutus"),
+               url(r'^pythonabout/$', views.pythonabout, name="pythonabout"),
+               url(r'^.*/$', views.fourzerofour, name="fourzerofour"),
+               ]
 
 urlpatterns += static(settings.STATIC_URL,
-                          document_root=settings.STATIC_ROOT)
+                      document_root=settings.STATIC_ROOT)
 urlpatterns += static(settings.MEDIA_URL,
-                          document_root=settings.MEDIA_ROOT)
-urlpatterns = format_suffix_patterns(urlpatterns)
+                      document_root=settings.MEDIA_ROOT)
 

homepage/views.py

@@ -1,31 +1,16 @@
-from django.shortcuts import render_to_response, RequestContext, HttpResponseRedirect
-
+from django.shortcuts import render
 
 def aboutus(request):
-    return render_to_response("aboutus.html",
-                              locals(),
-                              context_instance=RequestContext(request))
-
+    return render(request, "aboutus.html")
 
 def learnmore(request):
-    return render_to_response("learnmore.html",
-                              locals(),
-                              context_instance=RequestContext(request))
-
+    return render(request, "learnmore.html")
 
 def pythonabout(request):
-    return render_to_response("pythonabout.html",
-                              locals(),
-                              context_instance=RequestContext(request))
-
+    return render(request, "pythonabout.html")
 
 def fourzerofour(request):
-    return render_to_response("404.html",
-                              locals(),
-                              context_instance=RequestContext(request))
-
+    return render(request, "404.html")
 
 def home(request):
-    return render_to_response("sort.html",
-                              locals(),
-                              context_instance=RequestContext(request))
+    return render(request, "sort.html")

manage.py

@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.settings")
 
     from django.core.management import execute_from_command_line
 

requirements.txt requirements/requirements.txt

@@ -1,14 +1,16 @@
 """
+WSGI config for mysite project.
+
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
 """
 
 import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mysite.settings")
 
 application = get_wsgi_application()

settings.py

@@ -1,11 +1,9 @@
-from django.conf.urls import patterns, url
-from rest_framework.urlpatterns import format_suffix_patterns
+from django.conf.urls import url
 import views
+from views import thankyou, signup
 
-urlpatterns = patterns('',
-                    url(r'^api/$', views.SignUpList.as_view()),
-                    url(r'^thank-you/$', 'signups.views.thankyou', name='thankyou'),
-                    url(r'^signup/$', 'signups.views.signup', name='signup'),
-                       )
+urlpatterns = [url(r'^api/$', views.SignUpList.as_view()),
+               url(r'^thank-you/$', thankyou, name='thankyou'),
+               url(r'^signup/$', signup, name='signup'),
+               ]
 
-urlpatterns = format_suffix_patterns(urlpatterns)

settings/__init__.py

@@ -1,4 +1,4 @@
-from django.shortcuts import render_to_response, RequestContext, HttpResponseRedirect
+from django.shortcuts import  render, HttpResponseRedirect
 from .forms import SignUpForm
 from rest_framework import generics
 from models import SignUp
@@ -11,11 +11,8 @@ def signup(request):
   MailSender().send_mail_to_signup(form, request)
   return HttpResponseRedirect('/thank-you/')
 
-
 def thankyou(request):
-    return render_to_response("thankyou.html",
-                              locals(),
-                              context_instance =RequestContext(request))
+    return render(request, "thankyou.html")
 
 class SignUpList(generics.ListCreateAPIView):
     queryset = SignUp.objects.all()

settings/db.sqlite3

@@ -1,16 +1,12 @@
-from django.conf.urls import patterns, include, url
-from rest_framework.urlpatterns import format_suffix_patterns
-
-urlpatterns = patterns('',
-                    url(r'^choosesort/$', 'sorting.views.choosesort'),
-                    url(r'^quicksort/$', 'sorting.views.quicksort'),
-                    url(r'^bubblesort/$', 'sorting.views.bubblesort'),
-                    url(r'^mergesort/$', 'sorting.views.mergesort'),
-                    url(r'^insertionsort/$', 'sorting.views.insertionsort'),
-                    url(r'^selectionsort/$', 'sorting.views.selectionsort'),
-                    url(r'^getdata/$', 'sorting.views.getdata'),
-                      )
-
-urlpatterns = format_suffix_patterns(urlpatterns)
-
-
+from django.conf.urls import url
+from views import choosesort, quicksort, bubblesort, mergesort, insertionsort, selectionsort, getdata
+
+urlpatterns = [
+               url(r'^choosesort/$', choosesort, name="choosesort"),
+               url(r'^quicksort/$', quicksort, name="quicksort"),
+               url(r'^bubblesort/$', bubblesort, name="bubblesort"),
+               url(r'^mergesort/$', mergesort, name="mergesort"),
+               url(r'^insertionsort/$', insertionsort, name="insertionsort"),
+               url(r'^selectionsort/$', selectionsort, name="selectionsort"),
+               url(r'^getdata/$', getdata, name="getdata"),
+               ]

wsgi.py settings/wsgi.py

@@ -4,10 +4,8 @@
 from django.views.decorators.csrf import ensure_csrf_cookie
 from multiprocessing import Queue, Process
 import threading
-import multiprocessing
-from django.shortcuts import render_to_response, RequestContext, HttpResponseRedirect
-from django.shortcuts import HttpResponse
-
+from django.shortcuts import HttpResponse, render
+maxarray = 1000
 
 def getsort(request, sortname):
     input = request.POST["array"]
@@ -92,23 +90,16 @@ def choosesort(request):
 
 
 def quicksortabout(request):
-    return render_to_response("quicksortabout.html",
-                              locals(),
-                              context_instance =RequestContext(request))
+    return render(request, "quicksortabout.html")
+
 def mergesortabout(request):
-    return render_to_response("mergesortabout.html",
-                              locals(),
-                              context_instance =RequestContext(request))
+    return render(request, "mergesortabout.html")
 
 def bubblesortabout(request):
-    return render_to_response("bubblesortabout.html",
-                              locals(),
-                              context_instance =RequestContext(request))
+    return render(request, "bubblesortabout.html")
+
 def insertionsortabout(request):
-    return render_to_response("insertionsortabout.html",
-                              locals(),
-                              context_instance =RequestContext(request))
+    return render(request, "insertionsortabout.html")
+
 def selectionsortabout(request):
-    return render_to_response("selectionsortabout.html",
-                              locals(),
-                              context_instance =RequestContext(request))
+    return render(request, "selectionsortabout.html")