adjustments for django 1.4

diff --git a/postman/management/commands/postman_cleanup.py b/postman/management/commands/postman_cleanup.py
index 194239c1801f8908658a3411fc2c6a8a89d17cc5..509d8a7ad47279d7b59231141f0224d39755fdb7 100644 (file)
--- a/postman/management/commands/postman_cleanup.py
+++ b/postman/management/commands/postman_cleanup.py
@@ -1,8 +1,13 @@
-import datetime
+from datetime import timedelta
 from optparse import make_option
 
 from django.core.management.base import NoArgsCommand
 from django.db.models import Max, Count, F, Q
+try:
+    from django.utils.timezone import now   # Django 1.4 aware datetimes
+except ImportError:
+    from datetime import datetime
+    now = datetime.now
 
 from postman.models import Message
 
@@ -19,7 +24,7 @@ class Command(NoArgsCommand):
     def handle_noargs(self, **options):
         verbose = int(options.get('verbosity'))
         days = options.get('days')
-        date = datetime.date.today() - datetime.timedelta(days=days)
+        date = now() - timedelta(days=days)
         if verbose >= 1:
             self.stdout.write("Erase messages and conversations marked as deleted before %s\n" % date)
         # for a conversation to be candidate, all messages must satisfy the criteria

diff --git a/postman/test_urls.py b/postman/test_urls.py
index 1812aa0b41d0ba1c80c83642d7311d4bf63b19b2..611014c3fe4b484407a629aeae032502db3c75a9 100644 (file)
--- a/postman/test_urls.py
+++ b/postman/test_urls.py
@@ -3,7 +3,10 @@ URLconf for tests.py usage.
 
 """
 from django.conf import settings
-from django.conf.urls.defaults import *
+try:
+    from django.conf.urls import patterns, include, url # django 1.4
+except ImportError:
+    from django.conf.urls.defaults import patterns, include, url # django 1.3
 from django.forms import ValidationError
 from django.views.generic.simple import redirect_to
 

diff --git a/postman/urls.py b/postman/urls.py
index cd6495ef72bcd7a5c1a402ee9f3786a00b4f3b56..49d44c9365623c75c672f41bae38e8d650db4055 100644 (file)
--- a/postman/urls.py
+++ b/postman/urls.py
@@ -86,7 +86,10 @@ Refer to documentation.
     ..., {'formatters': (format_subject,format_body)}, name='postman_view'),
 
 """
-from django.conf.urls.defaults import *
+try:
+    from django.conf.urls import patterns, include, url # django 1.4
+except ImportError:
+    from django.conf.urls.defaults import patterns, include, url # django 1.3
 from django.views.generic.simple import redirect_to
 
 OPTION_MESSAGES = 'm'