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 4eb6f348a4764c6267d6dec9d17a60fdb2515faa..713a6fbe92160938e214c2ea5fc41a2cdda7b8bb 100755 (executable)
--- 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 daeaa504b54ae57fb9812ccf464bf1b8877bff9d..a5ba31e616c65935eac4cfd5399041f051293fc2 100644 (file)
--- 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 9505bb961965f5bfad56e996d2ca8d602d68aeba..97fe9acefc17dc935d708edbdae116882759c7ca 100644 (file)
--- 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 991d2f0c7271dd3fa3893b798e76357bad144705..ea3e37836c489968824cccc355f5e247ed347e79 100644 (file)
--- 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 7ce99ef3885fcc285cc367742b490478baca5982..899b0179ad5511f0448a804669ea43f1ff416d38 100644 (file)
--- 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 1f29f984b84419df9e79381e191b56491522cd9f..64cc2cb022c22f8ae0b37e0119cbb771ffc2e82f 100644 (file)
--- 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 972ca068b3729811ff7a6d427cfe5fab614f5e6f..e82bc6ee560d3f09b4a3e59edb4b9f695b0bead2 100644 (file)
--- 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 3463d18393906b1eec240deb01dcfaaf52c3ebcd..2d1a097788dec320220211c8883f5d68c3e49b00 100644 (file)
--- 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 1d254b1b1f063ab4b13f5b29d43361a80ea1abcb..b873f622b316f759f094a17a8fa576e7af540219 100644 (file)
--- 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 2fc374cbe3aa7a15bbe2cd7cb90bdd11a27bd092..8ec8cce05ba049e10d5d16b3e9a8a280f6310854 100644 (file)
--- 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 82dfb563a176f026d5c453b58aa84755be62b3d8..758b129398b4d9eabe2e8d729772c8a31f8be127 100644 (file)
--- 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 c368a6bcdd7e850fa1f38f4a06beff4061dbd351..a6897f22aae0ca12961413e2c1364dc58695332c 100644 (file)
--- 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 c3621d4faa67a357990f073564efcaf87059a85c..3ff7b13ec293711878953197002a3c4e2de36ff0 100644 (file)
--- 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 16226172470841144faa5b6add4998fad135f1f4..50d5467cf46913c040b42a27029a48208dee8d29 100644 (file)
--- 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 5a7ae2fb07c78ecf1919a5a3e6a84130eb21ba1f..1166ac6cef2476c28d56f94f441ae0ef7ee6bd9e 100644 (file)
--- 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 74e4f8f4d2a28234e11f06271900ca226b9773b7..2494f4ee52f2982d8eb8bc3832762501ef23f211 100644 (file)
--- 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 d42465ce6fdbd037de2ec2d88708049ec1e9bb0d..c60d2a00ec0ea56be468d2e24627a8e07f1de5c2 100644 (file)
--- 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 31751c3b262efdef8e729ac307f20f215f89b823..7bf1137394662cccac2a75200ee8528b330c7123 100644 (file)
--- 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 c5de1db56b170bedfb9432ecc7f38d478009141d..16fa2f1cf2bfa58b864badbfe2ab9610393dcea9 100644 (file)
--- 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 bddd15dac75772187c90841e3964e35f463294d0..75b1f73c21d91414863af3c8f96b79bbcd3bd54a 100644 (file)
--- 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 0f8dae97106036169c75c64066a1af9d4a3c6f58..ec3ce690da0afc18aecfd607ae9f7dfe058a7298 100644 (file)
--- 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 bcfc7f0fb98d13d03a551342e6cd26160683111a..1b9f9d1fcda1b001648675302baae51921635dac 100644 (file)
--- 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 da8644a40ec102601410aae85efe69111a4a65ba..4ef7689d4ca224884ffea79c30823fba4b7e670d 100644 (file)
--- 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 eacc07e432fe9f08b4a0da82afccfb555e9f6afb..c5bfc0207034cb69648a94a63b56acc0ebaafb54 100644 (file)
--- 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>