diff options
| author | luxagraf <sng@luxagraf.net> | 2014-05-08 19:44:58 -0400 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2014-05-08 19:44:58 -0400 |
| commit | 58e402a077c710c04934e3a7ddc25883427d1f64 (patch) | |
| tree | 485506e3c1805a793f2d5920751f53c400b08aac /config | |
| parent | 5f430f31474847ac50fa017dc1397c3bde2d140d (diff) | |
added birding app, fixed a few python-related bugs throughout the code base.
Diffstat (limited to 'config')
| -rwxr-xr-x | config/djadmin.sh | 2 | ||||
| -rw-r--r-- | config/settings/settings.py | 4 | ||||
| -rw-r--r-- | config/wsgi.py | 15 |
3 files changed, 10 insertions, 11 deletions
diff --git a/config/djadmin.sh b/config/djadmin.sh index a3e99f3..a6ae84c 100755 --- a/config/djadmin.sh +++ b/config/djadmin.sh @@ -3,7 +3,7 @@ DIR="$( cd "$( dirname $( dirname "${BASH_SOURCE[0]}" ) )" && pwd )" PYTHONPATH=$PYTHONPATH:$DIR PYTHONPATH=$PYTHONPATH:"${DIR}/app" PYTHONPATH=$PYTHONPATH:"${DIR}/app/lib" -PYTHONPATH=$PYTHONPATH:"${DIR}/venv/lib/python2.7/" +PYTHONPATH=$PYTHONPATH:"${DIR}/venv/lib/python3.4/" export PYTHONPATH export DJANGO_SETTINGS_MODULE=config.settings.settings ADMIN="${DIR}/venv/bin/django-admin.py" diff --git a/config/settings/settings.py b/config/settings/settings.py index a205776..82d31e6 100644 --- a/config/settings/settings.py +++ b/config/settings/settings.py @@ -155,12 +155,12 @@ INSTALLED_APPS = ( 'blog', 'photos', 'taggit', + 'typogrify', 'links', 'pagination', 'templatetags', 'projects', 'guide', 'pages', - 'books', - 'stuff', + 'birds', ) diff --git a/config/wsgi.py b/config/wsgi.py index ab5f23a..3decdc7 100644 --- a/config/wsgi.py +++ b/config/wsgi.py @@ -6,15 +6,14 @@ sys.stdout = sys.stderr SERVER_ROOT = abspath(dirname(dirname(__file__)))+'/' # Tell wsgi to add the Python site-packages to it's path. -site.addsitedir(SERVER_ROOT+'venv/lib/python2.7/site-packages') +site.addsitedir(SERVER_ROOT+'venv/lib/python3.4/site-packages') -from django.core.handlers.wsgi import WSGIHandler -os.environ['DJANGO_SETTINGS_MODULE'] = 'config.settings.settings' -application = WSGIHandler() +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.settings") sys.path = [SERVER_ROOT,] + sys.path +sys.path.insert(0, os.path.join(SERVER_ROOT, "app")) +sys.path.insert(0, os.path.join(SERVER_ROOT, "app/lib")) +sys.path.insert(0, os.path.join(SERVER_ROOT, "config")) -from django.conf import settings -sys.path.insert(0, os.path.join(settings.PROJ_ROOT, "app")) -sys.path.insert(0, os.path.join(settings.PROJ_ROOT, "app/lib")) -sys.path.insert(0, os.path.join(settings.PROJ_ROOT, "config")) +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() |