chore: Reduce deprecation warnings

- Remove USE_L10N setting
- Switch to Django's storages API
- Use new GISModelAdmin class
- Opt in to use new DjangoDivFormRenderer

Author: mjumbewu

src/project/settings.py

@@ -66,7 +66,6 @@
 
 LANGUAGE_CODE = 'en-us'
 USE_I18N = True
-USE_L10N = True
 
 ###############################################################################
 #
@@ -106,7 +105,8 @@
     },
 ]
 
-ATTACHMENT_STORAGE = 'django.core.files.storage.FileSystemStorage'
+# Use the new div-based form rendering to avoid RemovedInDjango50Warning
+FORM_RENDERER = 'django.forms.renderers.DjangoDivFormRenderer'
 
 ###############################################################################
 #
@@ -433,16 +433,27 @@ def custom_show_toolbar(request):
 # We support S3, GCS, and local filesystem.
 # Precedence: GCS > S3 > Local
 
-DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
-ATTACHMENT_STORAGE = DEFAULT_FILE_STORAGE
+STORAGES = {
+    'default': {
+        'BACKEND': 'django.core.files.storage.FileSystemStorage',
+    },
+    # Static files (CSS, JavaScript, Images)
+    # https://docs.djangoproject.com/en/1.6/howto/static-files/
+    'staticfiles': {
+        'BACKEND': 'django.contrib.staticfiles.storage.StaticFilesStorage',
+    },
+    'attachments': {
+        'BACKEND': 'django.core.files.storage.FileSystemStorage',
+    },
+}
+ATTACHMENT_STORAGE = STORAGES['attachments']['BACKEND']
 
 if 'GS_BUCKET_NAME' in environ:
     # Google Cloud Storage
     GS_BUCKET_NAME = environ['GS_BUCKET_NAME']
     GS_PROJECT_ID = environ.get('GS_PROJECT_ID')
 
-    DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+    STORAGES['default']['BACKEND'] = "storages.backends.gcloud.GoogleCloudStorage"
 
     GS_DEFAULT_ACL = "publicRead"
 
@@ -456,7 +467,7 @@ def custom_show_toolbar(request):
     MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 
     # Attachments
-    ATTACHMENT_STORAGE = DEFAULT_FILE_STORAGE
+    ATTACHMENT_STORAGE = STORAGES['attachments']['BACKEND'] = STORAGES['default']['BACKEND']
 
 elif all([key in environ for key in ('SHAREABOUTS_AWS_KEY',
                                      'SHAREABOUTS_AWS_SECRET',
@@ -468,8 +479,8 @@ def custom_show_toolbar(request):
     AWS_QUERYSTRING_AUTH = False
     AWS_PRELOAD_METADATA = True
 
-    DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
-    ATTACHMENT_STORAGE = DEFAULT_FILE_STORAGE
+    STORAGES['default']['BACKEND'] = 'storages.backends.s3boto3.S3Boto3Storage'
+    ATTACHMENT_STORAGE = STORAGES['attachments']['BACKEND'] = STORAGES['default']['BACKEND']
 
 
 if 'SHAREABOUTS_TWITTER_KEY' in environ and 'SHAREABOUTS_TWITTER_SECRET' in environ:

src/sa_api_v2/admin.py

@@ -82,7 +82,7 @@ def render(self, name, value, attrs=None, renderer=None):
         return super(PrettyAceWidget, self).render(name, value, attrs=attrs, renderer=renderer)
 
 
-BaseGeoAdmin = admin.OSMGeoAdmin if settings.USE_GEODB else admin.ModelAdmin
+BaseGeoAdmin = admin.GISModelAdmin if settings.USE_GEODB else admin.ModelAdmin
 
 
 class SubmittedThingAdmin(BaseGeoAdmin):

src/sa_api_v2/models/core.py

@@ -7,7 +7,7 @@
 else:
     from django.db import models
 
-from django.core.files.storage import get_storage_class
+from django.core.files.storage import storages
 from django.utils.timezone import now
 from .. import cache
 from .. import utils
@@ -18,6 +18,10 @@
 from PIL import Image, UnidentifiedImageError
 
 
+# Create a simple AttachmentStorage factory
+AttachmentStorage = lambda *a, **kw : storages.create_storage(storages.backends['attachments'], *a, **kw)
+
+
 class TimeStampedModel (models.Model):
     created_datetime = models.DateTimeField(default=now, blank=True, db_index=True)
     updated_datetime = models.DateTimeField(auto_now=True, db_index=True)
@@ -294,9 +298,6 @@ def timestamp_filename(attachment, filename):
     return ''.join(['attachments/', utils.base62_time(), '-', filename])
 
 
-AttachmentStorage = get_storage_class(settings.ATTACHMENT_STORAGE)
-
-
 class Attachment (CacheClearingModel, TimeStampedModel):
     """
     A file attached to a submitted thing.