Update usage of datetime.now to Django timezone aware now()

mayan/apps/bootstrap/literals.py

@@ -64,18 +64,16 @@ if YAML_AVAILABLE:
     FIXTURE_TYPES_CHOICES += (FIXTURE_TYPE_BETTER_YAML, _(u'Better YAML')),
     # better_yaml is not working with natural keys
 
-FIXTURE_METADATA_REMARK_CHARACTER = '#'
+BOOTSTRAP_EXTENSION = 'txt'
+BOOTSTRAP_REPOSITORY_INDEX_FILE = '_repo_index.txt'
+BOOTSTRAP_REPOSITORY_URL = 'http://bootstrap.mayan-edms.com'
+BOOTSTRAP_SETUP_MAGIC_NUMBER = 'bootstrap setup'
 DATETIME_STRING_FORMAT = '%a, %d %b %Y %H:%M:%S +0000'
 FIXTURE_METADATA_CREATED = 'created'
-FIXTURE_METADATA_EDITED = 'edited'
-FIXTURE_METADATA_MAYAN_VERSION = 'mayan_edms_version'
-FIXTURE_METADATA_FORMAT = 'format'
-FIXTURE_METADATA_NAME = 'name'
-FIXTURE_METADATA_SLUG = 'slug'
 FIXTURE_METADATA_DESCRIPTION = 'description'
-BOOTSTRAP_EXTENSION = 'txt'
-
-BOOTSTRAP_SETUP_MAGIC_NUMBER = 'bootstrap setup'
-
-BOOTSTRAP_REPOSITORY_URL = 'http://bootstrap.mayan-edms.com'
-BOOTSTRAP_REPOSITORY_INDEX_FILE = '_repo_index.txt'
+FIXTURE_METADATA_EDITED = 'edited'
+FIXTURE_METADATA_FORMAT = 'format'
+FIXTURE_METADATA_MAYAN_VERSION = 'mayan_edms_version'
+FIXTURE_METADATA_NAME = 'name'
+FIXTURE_METADATA_REMARK_CHARACTER = '#'
+FIXTURE_METADATA_SLUG = 'slug'

mayan/apps/bootstrap/models.py

@@ -15,6 +15,7 @@ except ImportError:
 from django.core import management
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.db import models
+from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 
 from .classes import BootstrapModel, FixtureMetadata
@@ -32,7 +33,7 @@ class BootstrapSetup(models.Model):
     description = models.TextField(verbose_name=_(u'description'), blank=True)
     fixture = models.TextField(verbose_name=_(u'fixture'), help_text=_(u'These are the actual database structure creation instructions.'))
     type = models.CharField(max_length=16, verbose_name=_(u'type'), choices=FIXTURE_TYPES_CHOICES)
-    created = models.DateTimeField(verbose_name=_('creation date and time'), default=lambda: datetime.datetime.now(), editable=False)
+    created = models.DateTimeField(verbose_name=_('creation date and time'), default=lambda: now(), editable=False)
 
     objects = BootstrapSetupManager()
 

mayan/apps/bootstrap/post_init.py

@@ -2,6 +2,8 @@ from __future__ import absolute_import
 
 import datetime
 
+from django.utils.timezone import now
+
 from mayan import __version__
 from navigation.api import register_links
 
@@ -21,7 +23,7 @@ register_links([BootstrapSetup], [link_bootstrap_setup_list, link_bootstrap_setu
 register_links(['bootstrap_setup_list', 'bootstrap_setup_create', 'bootstrap_setup_dump', 'bootstrap_setup_import_from_file', 'bootstrap_setup_import_from_url', 'bootstrap_setup_repository_sync'], [link_bootstrap_setup_list, link_bootstrap_setup_create, link_bootstrap_setup_dump, link_bootstrap_setup_import_from_file, link_bootstrap_setup_import_from_url, link_bootstrap_setup_repository_sync], menu_name='secondary_menu')
 
 FixtureMetadata(FIXTURE_METADATA_CREATED, generate_function=lambda fixture_instance: fixture_instance.created.strftime(DATETIME_STRING_FORMAT), read_function=lambda x: datetime.datetime.strptime(x, DATETIME_STRING_FORMAT), property_name='created')
-FixtureMetadata(FIXTURE_METADATA_EDITED, generate_function=lambda fixture_instance: datetime.datetime.now().strftime(DATETIME_STRING_FORMAT))
+FixtureMetadata(FIXTURE_METADATA_EDITED, generate_function=lambda fixture_instance: now().strftime(DATETIME_STRING_FORMAT))
 FixtureMetadata(FIXTURE_METADATA_MAYAN_VERSION, generate_function=lambda fixture_instance: __version__)
 FixtureMetadata(FIXTURE_METADATA_FORMAT, generate_function=lambda fixture_instance: fixture_instance.type, property_name='type')
 FixtureMetadata(FIXTURE_METADATA_NAME, generate_function=lambda fixture_instance: fixture_instance.name, property_name='name')