Merge pull request #1838 from MTG/use-tz

set USE_TZ=True
MTG · Feb 12, 2025 · 27b8004 · 27b8004
2 parents 8904da9 + c69752d
commit 27b8004
Show file tree

Hide file tree

Showing 49 changed files with 444 additions and 504 deletions.
diff --git a/accounts/fixtures/moderation_test_users.json b/accounts/fixtures/moderation_test_users.json
@@ -9,7 +9,7 @@
       "is_active": true,
       "is_superuser": false,
       "is_staff": false,
-      "last_login": "2011-03-01 15:43:05",
+      "last_login": "2011-03-01 15:43:05Z",
       "groups": [
 
       ],
@@ -18,7 +18,7 @@
       ],
       "password": "pbkdf2_sha256$24000$aiyPNxcYNtkU$bU2xoxfjFH6/Mkfx+D5tXLshXsybPmRITi0ZjRWFIwI=",
       "email": "[email protected]",
-      "date_joined": "2011-03-01 15:43:05"
+      "date_joined": "2011-03-01 15:43:05Z"
     }
   },
   {
@@ -31,7 +31,7 @@
       "is_active": true,
       "is_superuser": false,
       "is_staff": false,
-      "last_login": "2011-03-01 15:43:05",
+      "last_login": "2011-03-01 15:43:05Z",
       "groups": [
 
       ],
@@ -40,7 +40,7 @@
       ],
       "password": "pbkdf2_sha256$24000$aiyPNxcYNtkU$bU2xoxfjFH6/Mkfx+D5tXLshXsybPmRITi0ZjRWFIwI=",
       "email": "[email protected]",
-      "date_joined": "2011-03-01 15:43:05"
+      "date_joined": "2011-03-01 15:43:05Z"
     }
   },
   {
@@ -53,7 +53,7 @@
       "is_active": true,
       "is_superuser": true,
       "is_staff": true,
-      "last_login": "2011-03-01 15:43:05",
+      "last_login": "2011-03-01 15:43:05Z",
       "groups": [
 
       ],
@@ -62,7 +62,7 @@
       ],
       "password": "pbkdf2_sha256$24000$aiyPNxcYNtkU$bU2xoxfjFH6/Mkfx+D5tXLshXsybPmRITi0ZjRWFIwI=",
       "email": "[email protected]",
-      "date_joined": "2011-03-01 15:43:05"
+      "date_joined": "2011-03-01 15:43:05Z"
     }
   },
   {
@@ -75,7 +75,7 @@
       "is_active": true,
       "is_superuser": true,
       "is_staff": true,
-      "last_login": "2011-03-01 15:43:05",
+      "last_login": "2011-03-01 15:43:05Z",
       "groups": [
 
       ],
@@ -84,7 +84,7 @@
       ],
       "password": "pbkdf2_sha256$24000$aiyPNxcYNtkU$bU2xoxfjFH6/Mkfx+D5tXLshXsybPmRITi0ZjRWFIwI=",
       "email": "[email protected]",
-      "date_joined": "2011-03-01 15:43:05"
+      "date_joined": "2011-03-01 15:43:05Z"
     }
   }
 ]
diff --git a/accounts/fixtures/users.json b/accounts/fixtures/users.json
@@ -9,12 +9,12 @@
             "is_active": true,
             "is_superuser": false,
             "is_staff": false,
-            "last_login": "2010-10-19 18:19:42",
+            "last_login": "2010-10-19 18:19:42Z",
             "groups": [],
             "user_permissions": [],
             "password": "0187a748eed8aa2bd82576dc2cce0a6d",
             "email": "[email protected]",
-            "date_joined": "2005-03-09 09:50:34"
+            "date_joined": "2005-03-09 09:50:34Z"
         }
     },
     {
@@ -27,12 +27,12 @@
             "is_active": true,
             "is_superuser": true,
             "is_staff": true,
-            "last_login": "2010-10-13 15:46:20",
+            "last_login": "2010-10-13 15:46:20Z",
             "groups": [],
             "user_permissions": [],
             "password": "bf9db5ff0cc8ed8bf40413521ff465f4",
             "email": "[email protected]",
-            "date_joined": "2005-02-07 16:42:00"
+            "date_joined": "2005-02-07 16:42:00Z"
         }
     },
     {
@@ -45,12 +45,12 @@
             "is_active": true, 
             "is_superuser": true, 
             "is_staff": true, 
-            "last_login": "2010-10-13 15:46:20", 
+            "last_login": "2010-10-13 15:46:20Z", 
             "groups": [], 
             "user_permissions": [], 
             "password": "bf9db5ff0cc8ed8bf40413521ff465f4", 
             "email": "[email protected]",
-            "date_joined": "2005-02-07 16:42:00"
+            "date_joined": "2005-02-07 16:42:00Z"
         }
     },
     {
@@ -63,12 +63,12 @@
               "is_active": true,
               "is_superuser": false,
               "is_staff": false,
-              "last_login": "2010-10-13 15:46:20",
+              "last_login": "2010-10-13 15:46:20Z",
               "groups": [],
               "user_permissions": [],
               "password": "bf9db5ff0cc8ed8bf40413521ff465f4",
               "email": "[email protected]",
-              "date_joined": "2005-02-07 16:42:00"
+              "date_joined": "2005-02-07 16:42:00Z"
           }
     },
     {
@@ -81,12 +81,12 @@
               "is_active": true,
               "is_superuser": false,
               "is_staff": false,
-              "last_login": "2010-10-13 15:46:20",
+              "last_login": "2010-10-13 15:46:20Z",
               "groups": [],
               "user_permissions": [],
               "password": "bf9db5ff0cc8ed8bf40413521ff465f4",
               "email": "[email protected]",
-              "date_joined": "2005-02-07 16:42:00"
+              "date_joined": "2005-02-07 16:42:00Z"
           }
     },
     {
@@ -99,12 +99,12 @@
               "is_active": true,
               "is_superuser": false,
               "is_staff": false,
-              "last_login": "2010-10-13 15:46:20",
+              "last_login": "2010-10-13 15:46:20Z",
               "groups": [],
               "user_permissions": [],
               "password": "bf9db5ff0cc8ed8bf40413521ff465f4",
               "email": "[email protected]",
-              "date_joined": "2005-02-07 16:42:00"
+              "date_joined": "2005-02-07 16:42:00Z"
           }
     },
     {
@@ -117,12 +117,12 @@
               "is_active": false,
               "is_superuser": false,
               "is_staff": false,
-              "last_login": "2010-10-13 15:46:20",
+              "last_login": "2010-10-13 15:46:20Z",
               "groups": [],
               "user_permissions": [],
               "password": "bf9db5ff0cc8ed8bf40413521ff465f4",
               "email": "[email protected]",
-              "date_joined": "2005-02-07 16:42:00"
+              "date_joined": "2005-02-07 16:42:00Z"
           }
     }
 ]
diff --git a/accounts/management/commands/check_async_deleted_users.py b/accounts/management/commands/check_async_deleted_users.py
@@ -22,6 +22,7 @@
 import logging
 
 from django.conf import settings
+from django.utils import timezone
 
 from accounts.models import UserDeletionRequest
 from utils.management_commands import LoggingBaseCommand
@@ -43,7 +44,7 @@ def handle(self, *args, **options):
         user_ids_not_properly_deleted = []
         for user_deletion_request in UserDeletionRequest.objects.filter(
                 status=UserDeletionRequest.DELETION_REQUEST_STATUS_DELETION_TRIGGERED,
-                last_updated__lt=datetime.datetime.now()
+                last_updated__lt=timezone.now()
                                  - datetime.timedelta(hours=settings.CHECK_ASYNC_DELETED_USERS_HOURS_BACK)):
 
             if user_deletion_request.user_to is not None and \

diff --git a/accounts/management/commands/clean_old_tmp_upload_files.py b/accounts/management/commands/clean_old_tmp_upload_files.py
@@ -21,6 +21,7 @@
 
 from django.core.management.base import BaseCommand
 from django.conf import settings
+from django.utils import timezone
 import os
 import datetime
 
@@ -31,7 +32,7 @@ class Command(BaseCommand):
     def handle(self,  *args, **options):
         for f in os.listdir(settings.FILE_UPLOAD_TEMP_DIR):
             f_mod_date = datetime.datetime.fromtimestamp(os.path.getmtime(settings.FILE_UPLOAD_TEMP_DIR + f))
-            now = datetime.datetime.now()
+            now = timezone.now()
             if (now - f_mod_date).total_seconds() > 3600*24:
                 print(f"Deleting {f}")
                 os.remove(settings.FILE_UPLOAD_TEMP_DIR + f)
diff --git a/accounts/migrations/0026_auto_20191010_1437.py b/accounts/migrations/0026_auto_20191010_1437.py
@@ -2,7 +2,7 @@
 
 import datetime
 from django.db import migrations, models
-
+import django.utils.timezone
 
 class Migration(migrations.Migration):
 
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='deleteduser',
             name='date_joined',
-            field=models.DateTimeField(default=datetime.datetime(2019, 10, 10, 14, 37, 16, 698738)),
+            field=models.DateTimeField(default=django.utils.timezone.now),
             preserve_default=False,
         ),
         migrations.AlterField(

diff --git a/accounts/migrations/0027_deleteduser_last_login.py b/accounts/migrations/0027_deleteduser_last_login.py
@@ -2,7 +2,7 @@
 
 import datetime
 from django.db import migrations, models
-
+import django.utils.timezone
 
 class Migration(migrations.Migration):
 
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='deleteduser',
             name='last_login',
-            field=models.DateTimeField(default=datetime.datetime(2019, 10, 10, 14, 40, 42, 593925)),
+            field=models.DateTimeField(default=django.utils.timezone.now),
             preserve_default=False,
         ),
     ]
diff --git a/accounts/migrations/0036_auto_20230201_1102.py b/accounts/migrations/0036_auto_20230201_1102.py
@@ -1,9 +1,9 @@
 # Generated by Django 1.11.29 on 2023-02-01 11:02
 
-import datetime
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='gdpracceptance',
             name='date_accepted',
-            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime.now),
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
             preserve_default=False,
         ),
         migrations.AlterField(

diff --git a/accounts/models.py b/accounts/models.py
@@ -20,7 +20,6 @@
 
 import datetime
 import os
-import pytz
 import random
 
 from django.conf import settings
@@ -38,7 +37,7 @@
 from django.urls import reverse
 from django.utils.encoding import smart_str
 from django.utils.http import urlquote
-from django.utils.timezone import now
+from django.utils import timezone
 from psycopg2.errors import ForeignKeyViolation
 
 import tickets.models
@@ -349,7 +348,7 @@ def set_enabled_email_types(self, email_type_ids):
         # If we have just enabled stream emails, we should set last_stream_email_sent to now
         enabled_stream_emails = self.email_type_enabled(stream_emails_type)
         if not had_enabled_stream_emails and enabled_stream_emails:
-            self.last_stream_email_sent = datetime.datetime.now()
+            self.last_stream_email_sent = timezone.now()
             self.save()
 
     def get_user_tags(self):
@@ -384,18 +383,18 @@ def can_post_in_forum(self):
                           "pending to moderate"
 
         if self.num_posts >= 1 and self.num_sounds == 0:
-            today = datetime.datetime.today()
+            now = timezone.now()
             reference_date = self.user.posts.all()[0].created
 
             # Do not allow posts if last post is not older than 5 minutes
             seconds_per_post = settings.LAST_FORUM_POST_MINIMUM_TIME
-            if (today - self.user.posts.all().reverse()[0].created).total_seconds() < seconds_per_post:
+            if (now - self.user.posts.all().reverse()[0].created).total_seconds() < seconds_per_post:
                 return False, "We're sorry but you can't post to the forum because your last post was less than 5 " \
                               "minutes ago"
 
             # Do not allow posts if user has already posted N posts that day
-            max_posts_per_day = settings.BASE_MAX_POSTS_PER_DAY + pow((today - reference_date).days, 2)
-            if self.user.posts.filter(created__range=(today-datetime.timedelta(days=1), today)).count() >= \
+            max_posts_per_day = settings.BASE_MAX_POSTS_PER_DAY + pow((now - reference_date).days, 2)
+            if self.user.posts.filter(created__range=(now-datetime.timedelta(days=1), now)).count() >= \
                     max_posts_per_day:
                 return False, "We're sorry but you can't post to the forum because you exceeded your maximum number " \
                               "of posts per day"
@@ -785,7 +784,7 @@ class EmailBounce(models.Model):
     type = models.CharField(db_index=True, max_length=2, choices=TYPE_CHOICES, default=UNDETERMINED)
     type_map = {t[1]: t[0] for t in TYPE_CHOICES}
 
-    timestamp = models.DateTimeField(default=now)
+    timestamp = models.DateTimeField(default=timezone.now)
 
     class Meta:
         ordering = ("-timestamp",)
@@ -869,7 +868,7 @@ def update_status_history(sender, instance, **kwargs):
         should_update_status_history = True
 
     if should_update_status_history:
-        instance.status_history += ['{}: {} ({})'.format(pytz.utc.localize(datetime.datetime.utcnow()),
+        instance.status_history += ['{}: {} ({})'.format(timezone.now(),
                                                             instance.get_status_display(),
                                                             instance.status)]