Removing some old Gunicorn stuff and refactors for Django 1.6.

nicksergeant · Nov 6, 2013 · e0eac77 · e0eac77
1 parent 95f56ab
commit e0eac77
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 307 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Nick Sergeant
+Copyright (c) 2009-2013 Nick Sergeant
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/debug_wsgi.py b/debug_wsgi.py
diff --git a/gk b/gk
diff --git a/gs b/gs
diff --git a/gunicorn.conf.py b/gunicorn.conf.py
diff --git a/manage.py b/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", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/migrate.py b/migrate.py
diff --git a/requirements.txt b/requirements.txt
@@ -17,6 +17,7 @@ parsedatetime
 psycopg2
 pyelasticsearch==0.3
 python-memcached
+python-mimeparse
 python-postmark
 pyyaml
 raven

diff --git a/settings.py b/settings.py
@@ -138,7 +138,7 @@
     'utils.backends.EmailOrUsernameModelBackend',
 )
 
-ROOT_URLCONF = 'snipt.urls'
+ROOT_URLCONF = 'urls'
 
 PROJECT_PATH = os.path.abspath(os.path.dirname(__file__))