From 5fb3051805df2257d8aae12cc5f1f170debd30f2 Mon Sep 17 00:00:00 2001 From: Jonathan Hensley Date: Mon, 24 Feb 2014 16:14:24 -0500 Subject: [PATCH 1/2] removed deprecated commands from example app - replaced django.core.management.execute_manager with from django.core.management import execute_from_command_line --- example/manage.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/example/manage.py b/example/manage.py index 4022d36..ef567e1 100755 --- a/example/manage.py +++ b/example/manage.py @@ -9,13 +9,10 @@ sys.stderr.write("django-faq isn't installed; trying to use a source checkout in ../faq.") sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))) -from django.core.management import execute_manager -try: - import settings # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) - sys.exit(1) - if __name__ == "__main__": - execute_manager(settings) + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) + From 565fff8816a18f4717a95748d4edf21795389480 Mon Sep 17 00:00:00 2001 From: Jonathan Hensley Date: Mon, 24 Feb 2014 16:16:43 -0500 Subject: [PATCH 2/2] modified path to django.conf.urls - Modified path to support Django >= 1.6 - changed from django.conf.urls.defaults to django.conf.urls --- example/urls.py | 2 +- faq/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/urls.py b/example/urls.py index a9e5950..40ade54 100644 --- a/example/urls.py +++ b/example/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url, include +from django.conf.urls import patterns, url, include from django.contrib import admin; admin.autodiscover() from django.conf import settings from django.views.generic import TemplateView diff --git a/faq/urls.py b/faq/urls.py index 194cfe3..0f33af3 100644 --- a/faq/urls.py +++ b/faq/urls.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from django.conf.urls.defaults import * +from django.conf.urls import * from . import views as faq_views urlpatterns = patterns('',