Changeset 5c334f6

Timestamp:

Jun 15, 2014, 9:42:51 PM (11 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

75ccc48

Parents:

c386673

git-author:

Alex Dehnert <adehnert@…> (06/15/14 00:12:40)

git-committer:

Alex Dehnert <adehnert@…> (06/15/14 21:42:51)

Message:

Get started porting Remit to Django 1.6

Location:

remit

Files:

• manage.py (modified) (1 diff)
• urls.py (modified) (1 diff)
• vouchers/urls.py (modified) (1 diff)

remit/manage.py

@@ -1 @@
-#!/usr/bin/python
-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)
+#!/usr/bin/env python
+import os
+import sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

remit/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, include
 from django.contrib.auth.views import login, logout
 

remit/vouchers/urls.py

@@ -1 @@
-from django.conf.urls.defaults import *
-from django.views.generic.list_detail import object_list
+from django.conf.urls import patterns, include
 from django.contrib.auth.decorators import permission_required
 import vouchers.views