Skip to content

Commit 1443700

Browse files
committed
1.6
1 parent 2068102 commit 1443700

File tree

3 files changed

+15
-20
lines changed

3 files changed

+15
-20
lines changed

pythonkc_site/manage.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
#!/usr/bin/env python
2-
from django.core.management import execute_manager
3-
import imp
4-
try:
5-
imp.find_module('settings') # Assumed to be in the same directory.
6-
except ImportError:
7-
import sys
8-
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__)
9-
sys.exit(1)
10-
11-
import settings
2+
import os
3+
import sys
124

135
if __name__ == "__main__":
14-
execute_manager(settings)
6+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pythonkc_site.settings")
7+
8+
from django.core.management import execute_from_command_line
9+
10+
execute_from_command_line(sys.argv)
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
Django==1.3.6
2-
South==0.7.3
3-
distribute==0.7.3
1+
Django==1.6.11
2+
South==1.0.2
43
django-redis-cache==0.9.2
54
gondor==1.0.5
65
mimeparse==0.1.3
76
pip-tools==0.3.4
8-
psycopg2==2.4.2
7+
psycopg2==2.6
98
python-dateutil==1.5
109
pythonkc-meetups==0.1.0
11-
redis==2.8.0
12-
requests==0.7.5
10+
redis==2.10.3
11+
requests==2.7.0
1312
wsgiref==0.1.2

pythonkc_site/urls.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# -*- coding: utf-8 -*-
22

33

4-
from django.conf.urls.defaults import include
5-
from django.conf.urls.defaults import patterns
6-
from django.conf.urls.defaults import url
4+
from django.conf.urls import include
5+
from django.conf.urls import patterns
6+
from django.conf.urls import url
77
from django.views.decorators.cache import cache_page
88
from pythonkc_site.views import PythonKCHome
99

0 commit comments

Comments
 (0)