Skip to content

Commit 9957fcc

Browse files
committed
Fix project structure to Django 1.8
1 parent d362c94 commit 9957fcc

File tree

6 files changed

+24
-12
lines changed

6 files changed

+24
-12
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ db
77
/share
88
/env
99
/venv
10-
/django-jquery-file-upload
10+
1111
*.log
1212
*.pot
1313
*.pyc
1414
local_settings.py
15+
.idea
File renamed without changes.

settings.py renamed to django-jquery-file-upload/settings.py

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
'django.middleware.csrf.CsrfViewMiddleware',
101101
'django.contrib.auth.middleware.AuthenticationMiddleware',
102102
'django.contrib.messages.middleware.MessageMiddleware',
103+
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
103104
)
104105

105106
ROOT_URLCONF = 'django-jquery-file-upload.urls'
File renamed without changes.

manage.py

+20-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
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)
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
12+
#
13+
# if __name__ == "__main__":
14+
# execute_manager(settings)
1015

11-
import settings
16+
#!/usr/bin/env python
17+
import os, sys
1218

1319
if __name__ == "__main__":
14-
execute_manager(settings)
20+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django-jquery-file-upload.settings")
21+
22+
from django.core.management import execute_from_command_line
23+
24+
execute_from_command_line(sys.argv)

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
django<1.6
1+
django
22
pillow

0 commit comments

Comments
 (0)