From: Brett Parker <iDunno@sommitrealweird.co.uk>
Date: Wed, 3 Jun 2026 22:01:35 +0000 (+0100)
Subject: Update to work with newer django and python3
X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/commitdiff_plain/77c6bd606ee5003500ed80ea1e3561993f038e05

Update to work with newer django and python3
---

diff --git a/sommitrealweird/manage.py b/manage.py
similarity index 69%
rename from sommitrealweird/manage.py
rename to manage.py
index 4eb6f34..713a6fb 100755
--- a/sommitrealweird/manage.py
+++ b/manage.py
@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sommitrealweird.settings")
 
     from django.core.management import execute_from_command_line
 
diff --git a/sommitrealweird/blog/admin.py b/sommitrealweird/blog/admin.py
index daeaa50..a5ba31e 100644
--- a/sommitrealweird/blog/admin.py
+++ b/sommitrealweird/blog/admin.py
@@ -1,4 +1,4 @@
-from blog.models import BlogEntry, BlogSection
+from sommitrealweird.blog.models import BlogEntry, BlogSection
 from django.contrib import admin
 
 class BlogEntryAdmin(admin.ModelAdmin):
diff --git a/sommitrealweird/blog/context_processors.py b/sommitrealweird/blog/context_processors.py
index 9505bb9..97fe9ac 100644
--- a/sommitrealweird/blog/context_processors.py
+++ b/sommitrealweird/blog/context_processors.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from blog.models import BlogEntry, BlogSection
+from sommitrealweird.blog.models import BlogEntry, BlogSection
 import re
 
 def blog_feed(request):
diff --git a/sommitrealweird/blog/feeds.py b/sommitrealweird/blog/feeds.py
index 991d2f0..ea3e378 100644
--- a/sommitrealweird/blog/feeds.py
+++ b/sommitrealweird/blog/feeds.py
@@ -1,6 +1,6 @@
 from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
-from blog.models import BlogEntry
+from sommitrealweird.blog.models import BlogEntry
 from django.conf import settings
 
 class LatestBlogEntriesRss(Feed):
diff --git a/sommitrealweird/blog/urls.py b/sommitrealweird/blog/urls.py
index 7ce99ef..899b017 100644
--- a/sommitrealweird/blog/urls.py
+++ b/sommitrealweird/blog/urls.py
@@ -1,14 +1,14 @@
 from django.urls import re_path
-import blog.views
-from settings import MEDIA_ROOT, MEDIA_URL
+import sommitrealweird.blog.views
+from sommitrealweird.settings import MEDIA_ROOT, MEDIA_URL
 
 urlpatterns = [
-    re_path(r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/(?P<slug>[^/]+)(/|)$', blog.views.blog_view),
-    re_path(r'^(?P<year>[0-9]{4})(?P<month>[0-9]{2})(?P<day>[0-9]{2})-(?P<slug>[^/]+)\.html$', blog.views.blog_view),
-    re_path(r'^(?P<year>[0-9]{4})(?P<month>[0-9]{2})(?P<day>[0-9]{2})(?P<hour>[0-9]{2})(?P<minutes>[0-9]{2})-(?P<slug>[^/]+)\.html$', blog.views.blog_view),
-    re_path(r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/$', blog.views.blog_view),
-    re_path(r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/$', blog.views.blog_view),
-    re_path(r'^(?P<year>[0-9]{4})/$', blog.views.blog_view),
-    re_path(r'^section/(?P<section>[^/]*)/$', blog.views.blog_index),
-    re_path(r'^$', blog.views.blog_index),
+    re_path(r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/(?P<slug>[^/]+)(/|)$', sommitrealweird.blog.views.blog_view),
+    re_path(r'^(?P<year>[0-9]{4})(?P<month>[0-9]{2})(?P<day>[0-9]{2})-(?P<slug>[^/]+)\.html$', sommitrealweird.blog.views.blog_view),
+    re_path(r'^(?P<year>[0-9]{4})(?P<month>[0-9]{2})(?P<day>[0-9]{2})(?P<hour>[0-9]{2})(?P<minutes>[0-9]{2})-(?P<slug>[^/]+)\.html$', sommitrealweird.blog.views.blog_view),
+    re_path(r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/$', sommitrealweird.blog.views.blog_view),
+    re_path(r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/$', sommitrealweird.blog.views.blog_view),
+    re_path(r'^(?P<year>[0-9]{4})/$', sommitrealweird.blog.views.blog_view),
+    re_path(r'^section/(?P<section>[^/]*)/$', sommitrealweird.blog.views.blog_index),
+    re_path(r'^$', sommitrealweird.blog.views.blog_index),
 ]
diff --git a/sommitrealweird/blog/views.py b/sommitrealweird/blog/views.py
index 1f29f98..64cc2cb 100644
--- a/sommitrealweird/blog/views.py
+++ b/sommitrealweird/blog/views.py
@@ -1,4 +1,4 @@
-from blog.models import BlogEntry, BlogSection
+from sommitrealweird.blog.models import BlogEntry, BlogSection
 from django.http import Http404, HttpResponse
 from django.shortcuts import render
 from django.template import RequestContext, loader
diff --git a/sommitrealweird/bpcms/admin.py b/sommitrealweird/bpcms/admin.py
index 972ca06..e82bc6e 100644
--- a/sommitrealweird/bpcms/admin.py
+++ b/sommitrealweird/bpcms/admin.py
@@ -1,4 +1,4 @@
-from bpcms.models import CSSDocument, Document, Folder
+from sommitrealweird.bpcms.models import CSSDocument, Document, Folder
 from django.contrib import admin
 
 class CSSDocumentAdmin(admin.ModelAdmin):
diff --git a/sommitrealweird/bpcms/content_val.py b/sommitrealweird/bpcms/content_val.py
index 3463d18..2d1a097 100644
--- a/sommitrealweird/bpcms/content_val.py
+++ b/sommitrealweird/bpcms/content_val.py
@@ -2,7 +2,7 @@ from django.core import validators
 from django.conf import settings
 
 def is_allowed_name(slug, all_data):
-    from bpcms.models import Document, Folder
+    from sommitrealweird.bpcms.models import Document, Folder
     folder = None
     if all_data.has_key('folder'):
         folder = all_data['folder']
@@ -17,7 +17,7 @@ def is_allowed_name(slug, all_data):
             raise validators.ValidationError(u'That slug is reserved')
 
 def is_unique_name(slug, all_data):
-    from bpcms.models import Document, Folder
+    from sommitrealweird.bpcms.models import Document, Folder
     if all_data["folder"] != '' and all_data["id"] == '':
         folder_id = int(all_data["folder"])
         try:
diff --git a/sommitrealweird/bpcms/context_processors.py b/sommitrealweird/bpcms/context_processors.py
index 1d254b1..b873f62 100644
--- a/sommitrealweird/bpcms/context_processors.py
+++ b/sommitrealweird/bpcms/context_processors.py
@@ -1,4 +1,4 @@
-from bpcms.models import Document, Folder
+from sommitrealweird.bpcms.models import Document, Folder
 from django.conf import settings
 from django.core.cache import cache
 import re
diff --git a/sommitrealweird/bpcms/urls.py b/sommitrealweird/bpcms/urls.py
index 2fc374c..8ec8cce 100644
--- a/sommitrealweird/bpcms/urls.py
+++ b/sommitrealweird/bpcms/urls.py
@@ -1,9 +1,9 @@
 from django.urls import re_path
-import bpcms.views
+import sommitrealweird.bpcms.views
 
 urlpatterns = [
-    re_path(r'^$', bpcms.views.document_view, {'path': 'index'}, name='bpcms-document-view'),
-    re_path(r'^css-docs/(?P<slug>[^/]+)$', bpcms.views.css_view),
-    re_path(r'^(?P<path>.*)/$', bpcms.views.document_view, name='bpcms-document-view'),
+    re_path(r'^$', sommitrealweird.bpcms.views.document_view, {'path': 'index'}, name='bpcms-document-view'),
+    re_path(r'^css-docs/(?P<slug>[^/]+)$', sommitrealweird.bpcms.views.css_view),
+    re_path(r'^(?P<path>.*)/$', sommitrealweird.bpcms.views.document_view, name='bpcms-document-view'),
 ]
 
diff --git a/sommitrealweird/bpcms/views.py b/sommitrealweird/bpcms/views.py
index 82dfb56..758b129 100644
--- a/sommitrealweird/bpcms/views.py
+++ b/sommitrealweird/bpcms/views.py
@@ -1,4 +1,4 @@
-from bpcms.models import CSSDocument, Document, Folder
+from sommitrealweird.bpcms.models import CSSDocument, Document, Folder
 from django.http import Http404, HttpResponse
 from django.shortcuts import render
 from django.template import RequestContext, loader
diff --git a/sommitrealweird/generic/templatetags/thumbnail.py b/sommitrealweird/generic/templatetags/thumbnail.py
index c368a6b..a6897f2 100644
--- a/sommitrealweird/generic/templatetags/thumbnail.py
+++ b/sommitrealweird/generic/templatetags/thumbnail.py
@@ -1,6 +1,6 @@
 from django import template
 from django.conf import settings
-from generic import helpers
+from sommitrealweird.generic import helpers
 import sys
 
 register = template.Library()
diff --git a/sommitrealweird/generic/templatetags/xhtml11rst.py b/sommitrealweird/generic/templatetags/xhtml11rst.py
index c3621d4..3ff7b13 100644
--- a/sommitrealweird/generic/templatetags/xhtml11rst.py
+++ b/sommitrealweird/generic/templatetags/xhtml11rst.py
@@ -2,7 +2,7 @@ from django import template
 from django.conf import settings
 from django.utils.encoding import smart_bytes, force_str
 from django.utils.safestring import mark_safe
-from generic import docutils_xhtml11
+from sommitrealweird.generic import docutils_xhtml11
 
 register = template.Library()
 
diff --git a/sommitrealweird/generic/views.py b/sommitrealweird/generic/views.py
index 1622617..50d5467 100644
--- a/sommitrealweird/generic/views.py
+++ b/sommitrealweird/generic/views.py
@@ -1,4 +1,4 @@
-from settings import MEDIA_URL
+from sommitrealweird.settings import MEDIA_URL
 from django.shortcuts import render
 
 def render_404(request, template_name='404.html'):
diff --git a/sommitrealweird/photo/admin.py b/sommitrealweird/photo/admin.py
index 5a7ae2f..1166ac6 100644
--- a/sommitrealweird/photo/admin.py
+++ b/sommitrealweird/photo/admin.py
@@ -1,4 +1,4 @@
-from photo.models import Album, Photo
+from sommitrealweird.photo.models import Album, Photo
 from django.contrib import admin
 
 class AlbumAdmin(admin.ModelAdmin):
diff --git a/sommitrealweird/photo/context_processors.py b/sommitrealweird/photo/context_processors.py
index 74e4f8f..2494f4e 100644
--- a/sommitrealweird/photo/context_processors.py
+++ b/sommitrealweird/photo/context_processors.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from photo.models import Album, Photo
+from sommitrealweird.photo.models import Album, Photo
 import re
 
 def content_breadcrumb(request):
diff --git a/sommitrealweird/photo/migrations/0001_initial.py b/sommitrealweird/photo/migrations/0001_initial.py
index d42465c..c60d2a0 100644
--- a/sommitrealweird/photo/migrations/0001_initial.py
+++ b/sommitrealweird/photo/migrations/0001_initial.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.db.models.deletion
-import photo.models
+import sommitrealweird.photo.models
 
 
 class Migration(migrations.Migration):
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
             name='Photo',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('image', models.ImageField(null=True, upload_to=photo.models.get_upload_path)),
+                ('image', models.ImageField(null=True, upload_to=sommitrealweird.photo.models.get_upload_path)),
                 ('caption', models.TextField(blank=True, null=True)),
                 ('order', models.IntegerField(blank=True, null=True)),
                 ('album', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='photo.Album')),
diff --git a/sommitrealweird/photo/models.py b/sommitrealweird/photo/models.py
index 31751c3..7bf1137 100644
--- a/sommitrealweird/photo/models.py
+++ b/sommitrealweird/photo/models.py
@@ -16,6 +16,9 @@ class Album(models.Model):
     def __unicode__(self):
         return "%s" %(self.name,)
 
+    def __str__(self):
+        return "%s" %(self.name,)
+
 def get_upload_path(photo, filename):
     if photo.album:
         return "photos/%s/%s" %(photo.album.slug, filename)
@@ -30,3 +33,6 @@ class Photo(models.Model):
 
     def __unicode__(self):
         return "%s" %(self.image)
+
+    def __str__(self):
+        return "%s" %(self.image)
diff --git a/sommitrealweird/photo/urls.py b/sommitrealweird/photo/urls.py
index c5de1db..16fa2f1 100644
--- a/sommitrealweird/photo/urls.py
+++ b/sommitrealweird/photo/urls.py
@@ -1,6 +1,6 @@
 from django.urls import re_path
-from photo.models import Album
-from photo.views import AlbumListView, PhotoListView, PhotoView
+from sommitrealweird.photo.models import Album
+from sommitrealweird.photo.views import AlbumListView, PhotoListView, PhotoView
 
 urlpatterns = [
     re_path(r'^$', AlbumListView.as_view()),
diff --git a/sommitrealweird/photo/views.py b/sommitrealweird/photo/views.py
index bddd15d..75b1f73 100644
--- a/sommitrealweird/photo/views.py
+++ b/sommitrealweird/photo/views.py
@@ -1,6 +1,6 @@
 from django.views.generic import ListView, DetailView
 from django.http import Http404
-from photo.models import Album, Photo
+from sommitrealweird.photo.models import Album, Photo
 
 class AlbumListView(ListView):
     model = Album
diff --git a/sommitrealweird/settings.py b/sommitrealweird/settings.py
index 0f8dae9..ec3ce69 100644
--- a/sommitrealweird/settings.py
+++ b/sommitrealweird/settings.py
@@ -4,6 +4,9 @@
 # will be included at the end of the run
 
 import os
+from pathlib import Path
+
+BASE_DIR = Path(__file__).resolve().parent.parent
 
 topdir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
@@ -71,7 +74,7 @@ MIDDLEWARE = (
     'django.middleware.csrf.CsrfViewMiddleware',
 )
 
-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = 'sommitrealweird.urls'
 
 TEMPLATES = [
     {
@@ -86,12 +89,12 @@ TEMPLATES = [
                 'django.template.context_processors.debug',
                 'django.template.context_processors.i18n',
                 'django.template.context_processors.media',
-                'bpcms.context_processors.content_menu',
-                'bpcms.context_processors.content_submenu',
-                'bpcms.context_processors.content_breadcrumb',
-                'blog.context_processors.content_breadcrumb',
-                'blog.context_processors.blog_feed',
-                'photo.context_processors.content_breadcrumb',
+                'sommitrealweird.bpcms.context_processors.content_menu',
+                'sommitrealweird.bpcms.context_processors.content_submenu',
+                'sommitrealweird.bpcms.context_processors.content_breadcrumb',
+                'sommitrealweird.blog.context_processors.content_breadcrumb',
+                'sommitrealweird.blog.context_processors.blog_feed',
+                'sommitrealweird.photo.context_processors.content_breadcrumb',
             ],
             'debug': True,
         },
@@ -105,10 +108,10 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.messages',
-    'bpcms',
-    'generic',
-    'blog',
-    'photo',
+    'sommitrealweird.bpcms',
+    'sommitrealweird.generic',
+    'sommitrealweird.blog',
+    'sommitrealweird.photo',
 )
 
 
diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index bcfc7f0..1b9f9d1 100644
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,12 +1,12 @@
 from django.urls import include, re_path
 from django.conf.urls.static import static
-import bpcms.views
+import sommitrealweird.bpcms.views
 import django.views.static
-from settings import MEDIA_ROOT, MEDIA_URL, STATIC_ROOT, STATIC_URL
-from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
+from sommitrealweird.settings import MEDIA_ROOT, MEDIA_URL, STATIC_ROOT, STATIC_URL
+from sommitrealweird.blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
 from django.contrib import admin
 
-handler404 = 'generic.views.render_404'
+handler404 = 'sommitrealweird.generic.views.render_404'
 
 feeds_dict = {
     'blog': LatestBlogEntries,
@@ -23,15 +23,15 @@ urlpatterns = [
     # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),
 
     # Uncomment this for admin:
-    re_path(r'^$', bpcms.views.document_view, {'path': 'index'}),
+    re_path(r'^$', sommitrealweird.bpcms.views.document_view, {'path': 'index'}),
     re_path(r'^media/(?P<path>.*)$', django.views.static.serve, {'document_root': MEDIA_ROOT, 'show_indexes': True}),
     re_path(r'^static/(?P<path>.*)$', django.views.static.serve, {'document_root': STATIC_ROOT, 'show_indexes': True}),
     re_path(r'^admin/', admin.site.urls),
-    re_path(r'^blog/', include('blog.urls')),
-    re_path(r'^photo/', include('photo.urls')),
+    re_path(r'^blog/', include('sommitrealweird.blog.urls')),
+    re_path(r'^photo/', include('sommitrealweird.photo.urls')),
     #url(r'^photos/', include('photo.urls')),
-    re_path(r'^css-doc/(?P<slug>.*)$', bpcms.views.css_view),
+    re_path(r'^css-doc/(?P<slug>.*)$', sommitrealweird.bpcms.views.css_view),
     re_path(r'^feeds/rss/blog/', LatestBlogEntriesRss()),
     re_path(r'^feeds/blog/', LatestBlogEntries()),
-    re_path(r'^', include('bpcms.urls'))
+    re_path(r'^', include('sommitrealweird.bpcms.urls'))
 ]
diff --git a/sommitrealweird/django.wsgi b/sommitrealweird/wsgi.py
similarity index 77%
rename from sommitrealweird/django.wsgi
rename to sommitrealweird/wsgi.py
index da8644a..4ef7689 100644
--- a/sommitrealweird/django.wsgi
+++ b/sommitrealweird/wsgi.py
@@ -1,8 +1,10 @@
 import os, sys
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '.')))
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
 from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sommitrealweird.settings")
+
 application = get_wsgi_application()
 
diff --git a/templates/base.html b/templates/base.html
index eacc07e..c5bfc02 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -56,7 +56,7 @@
                 {% endblock %}
             </div>
             <div id="footer">
-                <p>Copyright &copy; 2008-2017 - <a href="mailto:iDunno@sommitrealweird.co.uk">Brett Parker</a></p>
+                <p>Copyright &copy; 2008-2026 - <a href="mailto:iDunno@sommitrealweird.co.uk">Brett Parker</a></p>
             </div>
         </div>
     </body>