Change structure and basic files to match django 1.5

59 files changed, 39 insertions, 11 deletions

diff --git a/__init__.py b/identity/__init__.py
index e69de29..e69de29 100644
--- a/__init__.py
+++ b/identity/__init__.py
diff --git a/accounts/__init__.py b/identity/accounts/__init__.py
index e69de29..e69de29 100644
--- a/accounts/__init__.py
+++ b/identity/accounts/__init__.py
diff --git a/accounts/admin.py b/identity/accounts/admin.py
index a74d99a..a74d99a 100644
--- a/accounts/admin.py
+++ b/identity/accounts/admin.py
diff --git a/accounts/backends.py b/identity/accounts/backends.py
index 1cea4b3..1cea4b3 100644
--- a/accounts/backends.py
+++ b/identity/accounts/backends.py
diff --git a/accounts/fields.py b/identity/accounts/fields.py
index 38ae04b..38ae04b 100644
--- a/accounts/fields.py
+++ b/identity/accounts/fields.py
diff --git a/accounts/forms.py b/identity/accounts/forms.py
index ea00270..ea00270 100644
--- a/accounts/forms.py
+++ b/identity/accounts/forms.py
diff --git a/accounts/models.py b/identity/accounts/models.py
index 0149d3d..0149d3d 100644
--- a/accounts/models.py
+++ b/identity/accounts/models.py
diff --git a/accounts/urls.py b/identity/accounts/urls.py
index 4df0e67..4df0e67 100644
--- a/accounts/urls.py
+++ b/identity/accounts/urls.py
diff --git a/accounts/views.py b/identity/accounts/views.py
index a2f08c6..a2f08c6 100644
--- a/accounts/views.py
+++ b/identity/accounts/views.py
diff --git a/accounts/widgets.py b/identity/accounts/widgets.py
index 91635ea..91635ea 100644
--- a/accounts/widgets.py
+++ b/identity/accounts/widgets.py
diff --git a/index/__init__.py b/identity/index/__init__.py
index e69de29..e69de29 100644
--- a/index/__init__.py
+++ b/identity/index/__init__.py
diff --git a/index/models.py b/identity/index/models.py
index 71a8362..71a8362 100644
--- a/index/models.py
+++ b/identity/index/models.py
diff --git a/index/tests.py b/identity/index/tests.py
index 501deb7..501deb7 100644
--- a/index/tests.py
+++ b/identity/index/tests.py
diff --git a/index/urls.py b/identity/index/urls.py
index 4acf1d7..4acf1d7 100644
--- a/index/urls.py
+++ b/identity/index/urls.py
diff --git a/index/views.py b/identity/index/views.py
index 61357a6..61357a6 100644
--- a/index/views.py
+++ b/identity/index/views.py
diff --git a/libraries/__init__.py b/identity/libraries/__init__.py
index e69de29..e69de29 100644
--- a/libraries/__init__.py
+++ b/identity/libraries/__init__.py
diff --git a/libraries/encryption.py b/identity/libraries/encryption.py
index 90b7fcf..90b7fcf 100644
--- a/libraries/encryption.py
+++ b/identity/libraries/encryption.py
diff --git a/libraries/exception.py b/identity/libraries/exception.py
index 522d5f9..522d5f9 100644
--- a/libraries/exception.py
+++ b/identity/libraries/exception.py
diff --git a/libraries/ldap_cleanup.py b/identity/libraries/ldap_cleanup.py
index 92dd450..92dd450 100644
--- a/libraries/ldap_cleanup.py
+++ b/identity/libraries/ldap_cleanup.py
diff --git a/libraries/ldap_wrappers.py b/identity/libraries/ldap_wrappers.py
index 27d5ff5..27d5ff5 100644
--- a/libraries/ldap_wrappers.py
+++ b/identity/libraries/ldap_wrappers.py
diff --git a/libraries/verification.py b/identity/libraries/verification.py
index e0b9e6f..e0b9e6f 100644
--- a/libraries/verification.py
+++ b/identity/libraries/verification.py
diff --git a/login/__init__.py b/identity/login/__init__.py
index e69de29..e69de29 100644
--- a/login/__init__.py
+++ b/identity/login/__init__.py
diff --git a/login/forms.py b/identity/login/forms.py
index 944c548..944c548 100644
--- a/login/forms.py
+++ b/identity/login/forms.py
diff --git a/login/tests.py b/identity/login/tests.py
index 2247054..2247054 100644
--- a/login/tests.py
+++ b/identity/login/tests.py
diff --git a/login/urls.py b/identity/login/urls.py
index ad281e6..ad281e6 100644
--- a/login/urls.py
+++ b/identity/login/urls.py
diff --git a/login/views.py b/identity/login/views.py
index ab48963..ab48963 100644
--- a/login/views.py
+++ b/identity/login/views.py
diff --git a/recover/__init__.py b/identity/recover/__init__.py
index e69de29..e69de29 100644
--- a/recover/__init__.py
+++ b/identity/recover/__init__.py
diff --git a/recover/forms.py b/identity/recover/forms.py
index 979b776..979b776 100644
--- a/recover/forms.py
+++ b/identity/recover/forms.py
diff --git a/recover/models.py b/identity/recover/models.py
index 30ec13f..30ec13f 100644
--- a/recover/models.py
+++ b/identity/recover/models.py
diff --git a/recover/tests.py b/identity/recover/tests.py
index 501deb7..501deb7 100644
--- a/recover/tests.py
+++ b/identity/recover/tests.py
diff --git a/recover/urls.py b/identity/recover/urls.py
index 77da8e7..77da8e7 100644
--- a/recover/urls.py
+++ b/identity/recover/urls.py
diff --git a/recover/views.py b/identity/recover/views.py
index 97eaddc..97eaddc 100644
--- a/recover/views.py
+++ b/identity/recover/views.py
diff --git a/settings/__init__.sample b/identity/settings/__init__.sample
index 3282748..3282748 100644
--- a/settings/__init__.sample
+++ b/identity/settings/__init__.sample
diff --git a/settings/base.py b/identity/settings/base.py
index 1d18f6f..1d18f6f 100644
--- a/settings/base.py
+++ b/identity/settings/base.py
diff --git a/settings/development.sample b/identity/settings/development.sample
index e717751..e717751 100644
--- a/settings/development.sample
+++ b/identity/settings/development.sample
diff --git a/settings/production.sample b/identity/settings/production.sample
index ba16172..ba16172 100644
--- a/settings/production.sample
+++ b/identity/settings/production.sample
diff --git a/signup/__init__.py b/identity/signup/__init__.py
index e69de29..e69de29 100644
--- a/signup/__init__.py
+++ b/identity/signup/__init__.py
diff --git a/signup/forms.py b/identity/signup/forms.py
index 4dcb70d..4dcb70d 100644
--- a/signup/forms.py
+++ b/identity/signup/forms.py
diff --git a/signup/tests.py b/identity/signup/tests.py
index 501deb7..501deb7 100644
--- a/signup/tests.py
+++ b/identity/signup/tests.py
diff --git a/signup/urls.py b/identity/signup/urls.py
index 842a908..842a908 100644
--- a/signup/urls.py
+++ b/identity/signup/urls.py
diff --git a/signup/views.py b/identity/signup/views.py
index 89ca5e2..89ca5e2 100644
--- a/signup/views.py
+++ b/identity/signup/views.py
diff --git a/templates/account/account.html b/identity/templates/account/account.html
index 550c904..550c904 100644
--- a/templates/account/account.html
+++ b/identity/templates/account/account.html
diff --git a/templates/account/all.html b/identity/templates/account/all.html
index 4e57605..4e57605 100644
--- a/templates/account/all.html
+++ b/identity/templates/account/all.html
diff --git a/templates/account/edit.html b/identity/templates/account/edit.html
index fa502f2..fa502f2 100644
--- a/templates/account/edit.html
+++ b/identity/templates/account/edit.html
diff --git a/templates/account/password.html b/identity/templates/account/password.html
index a2f304d..a2f304d 100644
--- a/templates/account/password.html
+++ b/identity/templates/account/password.html
diff --git a/templates/index.html b/identity/templates/index.html
index 1801675..1801675 100644
--- a/templates/index.html
+++ b/identity/templates/index.html
diff --git a/templates/login.html b/identity/templates/login.html
index 8a039d1..8a039d1 100644
--- a/templates/login.html
+++ b/identity/templates/login.html
diff --git a/templates/recover/password.html b/identity/templates/recover/password.html
index 50191d8..50191d8 100644
--- a/templates/recover/password.html
+++ b/identity/templates/recover/password.html
diff --git a/templates/recover/recover.html b/identity/templates/recover/recover.html
index c13e2f4..c13e2f4 100644
--- a/templates/recover/recover.html
+++ b/identity/templates/recover/recover.html
diff --git a/templates/signup.html b/identity/templates/signup.html
index 22a6090..22a6090 100644
--- a/templates/signup.html
+++ b/identity/templates/signup.html
diff --git a/templates/verification.html b/identity/templates/verification.html
index 1d0f781..1d0f781 100644
--- a/templates/verification.html
+++ b/identity/templates/verification.html
diff --git a/urls.py b/identity/urls.py
index 695bb28..695bb28 100644
--- a/urls.py
+++ b/identity/urls.py
diff --git a/verification/__init__.py b/identity/verification/__init__.py
index e69de29..e69de29 100644
--- a/verification/__init__.py
+++ b/identity/verification/__init__.py
diff --git a/verification/models.py b/identity/verification/models.py
index 5d7c440..5d7c440 100644
--- a/verification/models.py
+++ b/identity/verification/models.py
diff --git a/verification/tests.py b/identity/verification/tests.py
index 501deb7..501deb7 100644
--- a/verification/tests.py
+++ b/identity/verification/tests.py
diff --git a/verification/urls.py b/identity/verification/urls.py
index 477fdac..477fdac 100644
--- a/verification/urls.py
+++ b/identity/verification/urls.py
diff --git a/verification/views.py b/identity/verification/views.py
index 3929e9d..3929e9d 100644
--- a/verification/views.py
+++ b/identity/verification/views.py
diff --git a/identity/wsgi.py b/identity/wsgi.py
new file mode 100644
index 0000000..3e07a72
--- /dev/null
+++ b/identity/wsgi.py
@@ -0,0 +1,32 @@
+"""
+WSGI config for identity project.
+
+This module contains the WSGI application used by Django's development server
+and any production WSGI deployments. It should expose a module-level variable
+named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
+this application via the ``WSGI_APPLICATION`` setting.
+
+Usually you will have the standard Django WSGI application here, but it also
+might make sense to replace the whole Django WSGI application with a custom one
+that later delegates to the Django one. For example, you could introduce WSGI
+middleware here, or combine a Django application with an application of another
+framework.
+
+"""
+import os
+
+# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
+# if running multiple sites in the same mod_wsgi process. To fix this, use
+# mod_wsgi daemon mode with each site in its own daemon process, or use
+# os.environ["DJANGO_SETTINGS_MODULE"] = "identity.settings"
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "identity.settings")
+
+# This application object is used by any WSGI server configured to use this
+# file. This includes Django's development server, if the WSGI_APPLICATION
+# setting points here.
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
+
+# Apply WSGI middleware here.
+# from helloworld.wsgi import HelloWorldApplication
+# application = HelloWorldApplication(application)
diff --git a/manage.py b/manage.py
index 3e4eedc..9fbc1dc 100644..100755
--- a/manage.py
+++ b/manage.py
@@ -1,14 +1,10 @@
 #!/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
+import sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "identity.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)