Move files to new django 1.8 structure

Need another subdirectory. Also update manage.py and wsgi.py for
the django 1.8 formats.

diff --git a/hamnadmin/admin.wsgi b/hamnadmin/admin.wsgi
deleted file mode 100644 (file)
index c31dfd5..0000000
--- a/hamnadmin/admin.wsgi
+++ /dev/null
@@ -1,7 +0,0 @@
-import os, sys
-
-os.environ['DJANGO_SETTINGS_MODULE'] = 'hamnadmin.settings'
-
-import django.core.handlers.wsgi
-application = django.core.handlers.wsgi.WSGIHandler()
-

diff --git a/hamnadmin/__init__.py b/hamnadmin/hamnadmin/__init__.py
similarity index 100%
rename from hamnadmin/__init__.py
rename to hamnadmin/hamnadmin/__init__.py

diff --git a/hamnadmin/auth.py b/hamnadmin/hamnadmin/auth.py
similarity index 100%
rename from hamnadmin/auth.py
rename to hamnadmin/hamnadmin/auth.py

diff --git a/hamnadmin/exceptions.py b/hamnadmin/hamnadmin/exceptions.py
similarity index 100%
rename from hamnadmin/exceptions.py
rename to hamnadmin/hamnadmin/exceptions.py

diff --git a/hamnadmin/local_settings.py.sample b/hamnadmin/hamnadmin/local_settings.py.sample
similarity index 100%
rename from hamnadmin/local_settings.py.sample
rename to hamnadmin/hamnadmin/local_settings.py.sample

diff --git a/hamnadmin/register/__init__.py b/hamnadmin/hamnadmin/register/__init__.py
similarity index 100%
rename from hamnadmin/register/__init__.py
rename to hamnadmin/hamnadmin/register/__init__.py

diff --git a/hamnadmin/register/admin.py b/hamnadmin/hamnadmin/register/admin.py
similarity index 100%
rename from hamnadmin/register/admin.py
rename to hamnadmin/hamnadmin/register/admin.py

diff --git a/hamnadmin/register/models.py b/hamnadmin/hamnadmin/register/models.py
similarity index 100%
rename from hamnadmin/register/models.py
rename to hamnadmin/hamnadmin/register/models.py

diff --git a/hamnadmin/register/templates/404.html b/hamnadmin/hamnadmin/register/templates/404.html
similarity index 100%
rename from hamnadmin/register/templates/404.html
rename to hamnadmin/hamnadmin/register/templates/404.html

diff --git a/hamnadmin/register/templates/500.html b/hamnadmin/hamnadmin/register/templates/500.html
similarity index 100%
rename from hamnadmin/register/templates/500.html
rename to hamnadmin/hamnadmin/register/templates/500.html

diff --git a/hamnadmin/register/templates/admin/login.html b/hamnadmin/hamnadmin/register/templates/admin/login.html
similarity index 100%
rename from hamnadmin/register/templates/admin/login.html
rename to hamnadmin/hamnadmin/register/templates/admin/login.html

diff --git a/hamnadmin/register/templates/admin/register/blog/change_form.html b/hamnadmin/hamnadmin/register/templates/admin/register/blog/change_form.html
similarity index 100%
rename from hamnadmin/register/templates/admin/register/blog/change_form.html
rename to hamnadmin/hamnadmin/register/templates/admin/register/blog/change_form.html

diff --git a/hamnadmin/register/templates/aggregatorlog.html b/hamnadmin/hamnadmin/register/templates/aggregatorlog.html
similarity index 100%
rename from hamnadmin/register/templates/aggregatorlog.html
rename to hamnadmin/hamnadmin/register/templates/aggregatorlog.html

diff --git a/hamnadmin/register/templates/blogposts.html b/hamnadmin/hamnadmin/register/templates/blogposts.html
similarity index 100%
rename from hamnadmin/register/templates/blogposts.html
rename to hamnadmin/hamnadmin/register/templates/blogposts.html

diff --git a/hamnadmin/register/templates/index.html b/hamnadmin/hamnadmin/register/templates/index.html
similarity index 100%
rename from hamnadmin/register/templates/index.html
rename to hamnadmin/hamnadmin/register/templates/index.html

diff --git a/hamnadmin/register/templates/internal_error.html b/hamnadmin/hamnadmin/register/templates/internal_error.html
similarity index 100%
rename from hamnadmin/register/templates/internal_error.html
rename to hamnadmin/hamnadmin/register/templates/internal_error.html

diff --git a/hamnadmin/register/templates/regbase.html b/hamnadmin/hamnadmin/register/templates/regbase.html
similarity index 100%
rename from hamnadmin/register/templates/regbase.html
rename to hamnadmin/hamnadmin/register/templates/regbase.html

diff --git a/hamnadmin/register/urls.py b/hamnadmin/hamnadmin/register/urls.py
similarity index 100%
rename from hamnadmin/register/urls.py
rename to hamnadmin/hamnadmin/register/urls.py

diff --git a/hamnadmin/register/views.py b/hamnadmin/hamnadmin/register/views.py
similarity index 100%
rename from hamnadmin/register/views.py
rename to hamnadmin/hamnadmin/register/views.py

diff --git a/hamnadmin/settings.py b/hamnadmin/hamnadmin/settings.py
similarity index 100%
rename from hamnadmin/settings.py
rename to hamnadmin/hamnadmin/settings.py

diff --git a/hamnadmin/urls.py b/hamnadmin/hamnadmin/urls.py
similarity index 100%
rename from hamnadmin/urls.py
rename to hamnadmin/hamnadmin/urls.py

diff --git a/hamnadmin/hamnadmin/wsgi.py b/hamnadmin/hamnadmin/wsgi.py
new file mode 100644 (file)
index 0000000..de4944b
--- /dev/null
+++ b/hamnadmin/hamnadmin/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for hamnadmin project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hamnadmin.settings")
+
+application = get_wsgi_application()

diff --git a/hamnadmin/manage.py b/hamnadmin/manage.py
index 5e78ea979ea3846a4602f604e265fc4666beffac..12f182b624a11b5ff1f3b54d9b1da83a8bed4747 100755 (executable)
--- a/hamnadmin/manage.py
+++ b/hamnadmin/manage.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env 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)
+import os
+import sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hamnadmin.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)