Merge pull request #7 from isaacm/upgrade-to-mezzanine-4.2.3

Upgrade to mezzanine-4.2.3

Author: thecodinghouse

requirements.txt

@@ -1 +1 @@
-Mezzanine==3.1.10
+Mezzanine==4.2.3

settings.py

@@ -137,20 +137,14 @@
 #   * Receive x-headers
 INTERNAL_IPS = ("127.0.0.1",)
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    "django.template.loaders.filesystem.Loader",
-    "django.template.loaders.app_directories.Loader",
-)
-
 AUTHENTICATION_BACKENDS = ("mezzanine.core.auth_backends.MezzanineBackend",)
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
     "django.contrib.staticfiles.finders.FileSystemFinder",
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 # The numeric mode to set newly-uploaded files to. The value should be
@@ -223,18 +217,51 @@
 # or "C:/www/django/templates".
 # Always use forward slashes, even on Windows.
 # Don't forget to use absolute paths, not relative paths.
-TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates"),)
+TEMPLATES = [
+     {
+         'BACKEND': 'django.template.backends.django.DjangoTemplates',
+         'DIRS': [
+             # insert your TEMPLATE_DIRS here
+             os.path.join(PROJECT_ROOT, "templates"),
+         ],
+         'OPTIONS': {
+             'context_processors': [
+                 # Insert your TEMPLATE_CONTEXT_PROCESSORS here or use this
+                 # list if you haven't customized them:
+                 'django.contrib.auth.context_processors.auth',
+                 'django.template.context_processors.debug',
+                 'django.template.context_processors.i18n',
+                 'django.template.context_processors.media',
+                 'django.template.context_processors.request',
+                 'django.template.context_processors.static',
+                 'django.template.context_processors.tz',
+                 'django.contrib.messages.context_processors.messages',
+                 'mezzanine.pages.context_processors.page',
+                 "mezzanine.conf.context_processors.settings",
+                 "mezzanine.pages.context_processors.page",
+             ],
+             'loaders': [
+                 # insert your TEMPLATE_LOADERS here
+                 "django.template.loaders.filesystem.Loader",
+                 "django.template.loaders.app_directories.Loader",
+             ],
+             'builtins': [
+                 'mezzanine.template.loader_tags',
+             ]
+         },
+     },
+ ]
 
 
 ################
 # APPLICATIONS #
 ################
 
 INSTALLED_APPS = (
-	"flat",
-	#"moderna",
-	#"nova",
-	#"solid",
+    "flat",
+    #"moderna",
+    #"nova",
+    #"solid",
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
@@ -256,22 +283,6 @@
     #"mezzanine.mobile",
 )
 
-# List of processors used by RequestContext to populate the context.
-# Each one should be a callable that takes the request object as its
-# only parameter and returns a dictionary to add to the context.
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.contrib.messages.context_processors.messages",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.static",
-    "django.core.context_processors.media",
-    "django.core.context_processors.request",
-    "django.core.context_processors.tz",
-    "mezzanine.conf.context_processors.settings",
-    "mezzanine.pages.context_processors.page",
-)
-
 # List of middleware classes to use. Order is important; in the request phase,
 # these middleware classes will be applied in the order given, and in the
 # response phase the middleware will be applied in reverse order.

urls.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 
@@ -13,13 +13,13 @@
 # You can also change the ``home`` view to add your own functionality
 # to the project's homepage.
 
-urlpatterns = i18n_patterns("",
+urlpatterns = i18n_patterns(
     # Change the admin prefix here to use an alternate URL for the
     # admin interface, which would be marginally more secure.
-    ("^admin/", include(admin.site.urls)),
+    url("^admin/", include(admin.site.urls)),
 )
 
-urlpatterns += patterns('',
+urlpatterns += [
 
     # We don't want to presume how your homepage works, so here are a
     # few patterns you can use to set it up.
@@ -69,7 +69,7 @@
     # ``mezzanine.urls``, go right ahead and take the parts you want
     # from it, and use them directly below instead of using
     # ``mezzanine.urls``.
-    ("^", include("mezzanine.urls")),
+    url("^", include("mezzanine.urls")),
 
     # MOUNTING MEZZANINE UNDER A PREFIX
     # ---------------------------------
@@ -87,7 +87,7 @@
 
     # ("^%s/" % settings.SITE_PREFIX, include("mezzanine.urls"))
 
-)
+]
 
 # Adds ``STATIC_URL`` to the context of error pages, so that error
 # pages can use JS, CSS and images.