Merge "Remove oslo.utils"

3 files changed, 10 insertions, 9 deletions

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 76e57ed2..f8d6aad0 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -21,6 +21,7 @@ import io
 import logging
 import os
 
+import iso8601
 from novaclient import api_versions
 from novaclient.v2 import servers
 from openstack import exceptions as sdk_exceptions
@@ -29,7 +30,6 @@ from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-from oslo_utils import timeutils
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
@@ -1455,8 +1455,8 @@ class ListServer(command.Lister):
                 raise exceptions.CommandError(msg)
 
             try:
-                timeutils.parse_isotime(search_opts['changes-before'])
-            except ValueError:
+                iso8601.parse_date(search_opts['changes-before'])
+            except (TypeError, iso8601.ParseError):
                 raise exceptions.CommandError(
                     _('Invalid changes-before value: %s') %
                     search_opts['changes-before']
@@ -1464,8 +1464,8 @@ class ListServer(command.Lister):
 
         if search_opts['changes-since']:
             try:
-                timeutils.parse_isotime(search_opts['changes-since'])
-            except ValueError:
+                iso8601.parse_date(search_opts['changes-since'])
+            except (TypeError, iso8601.ParseError):
                 raise exceptions.CommandError(
                     _('Invalid changes-since value: %s') %
                     search_opts['changes-since']
diff --git a/openstackclient/compute/v2/server_backup.py b/openstackclient/compute/v2/server_backup.py
index a5d43fc6..b1b821b2 100644
--- a/openstackclient/compute/v2/server_backup.py
+++ b/openstackclient/compute/v2/server_backup.py
@@ -15,10 +15,11 @@
 
 """Compute v2 Server action implementations"""
 
+import importlib
+
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-from oslo_utils import importutils
 
 from openstackclient.i18n import _
 
@@ -119,7 +120,7 @@ class CreateServerBackup(command.ShowOne):
             info['properties'] = utils.format_dict(info.get('properties', {}))
         else:
             # Get the right image module to format the output
-            image_module = importutils.import_module(
+            image_module = importlib.import_module(
                 self.IMAGE_API_VERSIONS[
                     self.app.client_manager._api_version['image']
                 ]
diff --git a/openstackclient/compute/v2/server_image.py b/openstackclient/compute/v2/server_image.py
index fea87af8..c12bc2b3 100644
--- a/openstackclient/compute/v2/server_image.py
+++ b/openstackclient/compute/v2/server_image.py
@@ -15,12 +15,12 @@
 
 """Compute v2 Server action implementations"""
 
+import importlib
 import logging
 
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-from oslo_utils import importutils
 
 from openstackclient.i18n import _
 
@@ -99,7 +99,7 @@ class CreateServerImage(command.ShowOne):
             info['properties'] = utils.format_dict(info.get('properties', {}))
         else:
             # Get the right image module to format the output
-            image_module = importutils.import_module(
+            image_module = importlib.import_module(
                 self.IMAGE_API_VERSIONS[
                     self.app.client_manager._api_version['image']
                 ]