1.9 upgrades.

Related to https://github.com/django-wiki/django-wiki/pull/507

testproject/testproject/settings.py

@@ -3,7 +3,6 @@ from os import path as os_path
 import os
 
 PROJECT_PATH = os_path.abspath(os_path.split(__file__)[0])
-PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 DEBUG = True
 
@@ -80,7 +79,7 @@ TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-            os.path.join(PROJECT_DIR, 'templates'),
+            os.path.join(PROJECT_PATH, 'templates'),
         ],
         'APP_DIRS': True,
         'OPTIONS': {

testproject/testproject/urls.py

 from django.conf.urls import include, url
 from django.conf import settings
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from django.views import static
+from django.views.static import serve as static_serve
 
 from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^notify/', include('django_notify.urls', namespace='notify')),
 ]
@@ -15,7 +14,7 @@ urlpatterns = [
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
     urlpatterns += [
-        url(r'^media/(?P<path>.*)$', static.serve, {'document_root': settings.MEDIA_ROOT,}),
+        url(r'^media/(?P<path>.*)$', static_serve, {'document_root': settings.MEDIA_ROOT}),
     ]