Upgrade to Django 1.5

Reorganise file layout.
numbas · Mar 12, 2013 · 02d7ac0 · 02d7ac0
1 parent fd4b334
commit 02d7ac0
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 13 deletions.
diff --git a/accounts/urls.py b/accounts/urls.py
@@ -25,7 +25,7 @@
 from registration.views import activate
 from accounts.views import register
 
-import settings
+from numbas import settings
 
 
 

diff --git a/manage.py b/manage.py
@@ -1,14 +1,9 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-import imp
-try:
-    imp.find_module('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" % __file__)
-    sys.exit(1)
-
-import settings
+import os, sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "numbas.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/__init__.py → numbas/__init__.py b/__init__.py → numbas/__init__.py
diff --git a/database.py.dist → numbas/database.py.dist b/database.py.dist → numbas/database.py.dist
diff --git a/ldap_auth.py.dist → numbas/ldap_auth.py.dist b/ldap_auth.py.dist → numbas/ldap_auth.py.dist
diff --git a/numbas_auth.py → numbas/numbas_auth.py b/numbas_auth.py → numbas/numbas_auth.py
diff --git a/requirements.pip → numbas/requirements.pip b/requirements.pip → numbas/requirements.pip
diff --git a/settings.py.dist → numbas/settings.py.dist b/settings.py.dist → numbas/settings.py.dist
diff --git a/shib_auth.py.dist → numbas/shib_auth.py.dist b/shib_auth.py.dist → numbas/shib_auth.py.dist
diff --git a/urls.py → numbas/urls.py b/urls.py → numbas/urls.py
@@ -11,7 +11,7 @@
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
-from django.conf.urls import *
+from django.conf.urls import patterns, include, url
 from django.conf.urls.static import static
 import settings