Merge "Replace deprecated django.utils.datetime_safe"

openstack_auth/tests/data_v3.py

@@ -14,7 +14,6 @@
 import datetime
 import uuid
 
-from django.utils import datetime_safe
 from keystoneauth1.access import access
 from keystoneauth1.access import service_catalog
 from keystoneclient.v3 import domains
@@ -175,8 +174,8 @@ def generate_test_data(service_providers=False, endpoint='localhost'):
     }
 
     # Tokens
-    tomorrow = datetime_safe.datetime.now() + datetime.timedelta(days=1)
-    expiration = datetime_safe.datetime.isoformat(tomorrow)
+    tomorrow = datetime.datetime.now() + datetime.timedelta(days=1)
+    expiration = datetime.datetime.isoformat(tomorrow)
     auth_token = uuid.uuid4().hex
 
     auth_response_headers = {

openstack_dashboard/test/test_data/keystone_data.py

@@ -13,10 +13,9 @@
 #    under the License.
 
 import copy
-from datetime import timedelta
+import datetime
 
 from django.conf import settings
-from django.utils import datetime_safe
 
 from keystoneclient import access
 from keystoneclient.v2_0 import roles
@@ -380,7 +379,7 @@ def data(TEST):
     TEST.tenants.add(tenant, disabled_tenant, tenant_unicode)
     TEST.tenant = tenant  # Your "current" tenant
 
-    tomorrow = datetime_safe.datetime.now() + timedelta(days=1)
+    tomorrow = datetime.datetime.now() + datetime.timedelta(days=1)
     expiration = tomorrow.isoformat()
 
     scoped_token_dict = {