Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprekoitujen asioiden poistaminen #53

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions web/manage.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
#!/usr/bin/python2

from __future__ import print_function
import os
import sys

print(sys.path)
from django.core.management import execute_manager

try:
import settings #
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)
from django.core.management import execute_from_command_line

if __name__ == "__main__":
execute_manager(settings)
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
execute_from_command_line(sys.argv)
1 change: 0 additions & 1 deletion web/settings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
"django.contrib.admin",
#'django.contrib.formtools',
"django.template",
"django.contrib.databrowse",
]

LOGIN_URL = "/kipa/"
Expand Down
2 changes: 1 addition & 1 deletion web/tupa/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# KiPa(KisaPalvelu), tuloslaskentajärjestelmä partiotaitokilpailuihin
# Copyright (C) 2010 Espoon Partiotuki ry. ept@partio.fi

from django.conf.urls.defaults import *
from django.conf.urls import patterns
from models import *
from django.conf import settings

Expand Down
2 changes: 1 addition & 1 deletion web/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import include, patterns
from django.contrib import admin
from django.conf import settings

Expand Down