From 00953324ac09d6ae5739ac3da6a69522628691ae Mon Sep 17 00:00:00 2001
From: Ilmari Marttila <ilmari.marttila@gmail.com>
Date: Tue, 22 Oct 2024 09:59:20 +0300
Subject: [PATCH 1/3] Replace deprecated execute_manager with
 execute_from_command_line

---
 web/manage.py | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/web/manage.py b/web/manage.py
index a0b624bd..339a88f4 100755
--- a/web/manage.py
+++ b/web/manage.py
@@ -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)

From 406584e5061b014078159294b812bb921c2f2dc9 Mon Sep 17 00:00:00 2001
From: Ilmari Marttila <ilmari.marttila@gmail.com>
Date: Tue, 22 Oct 2024 10:06:13 +0300
Subject: [PATCH 2/3] Replace deprecated django.conf.urls.defaults with
 django.conf.urls

django.conf.urls.defaults will be removed in Django 1.6.
---
 web/tupa/urls.py | 2 +-
 web/urls.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/tupa/urls.py b/web/tupa/urls.py
index 231f6f12..2150b62e 100644
--- a/web/tupa/urls.py
+++ b/web/tupa/urls.py
@@ -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
 
diff --git a/web/urls.py b/web/urls.py
index 22f12308..cf9d0b92 100644
--- a/web/urls.py
+++ b/web/urls.py
@@ -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
 

From 2f7e231ad558a5d7b2b503180450373d62ec0e6b Mon Sep 17 00:00:00 2001
From: Ilmari Marttila <ilmari.marttila@gmail.com>
Date: Tue, 22 Oct 2024 12:20:41 +0300
Subject: [PATCH 3/3] Remove deprecated Databrowse

Databrowse is removed from django.contrib in Django 1.6.

Databrowse was taken in use in e061dbd9
and it was removed from urlpatterns
in acf8ac3c but was left in INSTALLED_APPS list.
---
 web/settings/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/settings/__init__.py b/web/settings/__init__.py
index ca5971c2..9017a4d5 100644
--- a/web/settings/__init__.py
+++ b/web/settings/__init__.py
@@ -107,7 +107,6 @@
     "django.contrib.admin",
     #'django.contrib.formtools',
     "django.template",
-    "django.contrib.databrowse",
 ]
 
 LOGIN_URL = "/kipa/"