Merge "Replace basestring by six.string_types"

Jenkins · openstack-gerrit · commit e3d686f39ad9 · 2014-01-24T07:00:06.000Z
diff --git a/novaclient/tests/v1_1/test_shell.py b/novaclient/tests/v1_1/test_shell.py
@@ -461,7 +461,8 @@ def test_boot_metadata(self):
         )
 
     def test_boot_hints(self):
-        self.run_command('boot --image 1 --flavor 1 --hint a=b=c some-server ')
+        self.run_command('boot --image 1 --flavor 1 '
+                         '--hint a=b0=c0 --hint a=b1=c1 some-server ')
         self.assert_called_anytime(
             'POST', '/servers',
             {
@@ -472,7 +473,7 @@ def test_boot_hints(self):
                     'min_count': 1,
                     'max_count': 1,
                 },
-                'os:scheduler_hints': {'a': 'b=c'},
+                'os:scheduler_hints': {'a': ['b0=c0', 'b1=c1']},
             },
         )
 
diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py
@@ -256,7 +256,7 @@ def _boot(cs, args, reservation_id=None, min_count=None, max_count=None):
             # NOTE(vish): multiple copies of the same hint will
             #             result in a list of values
             if key in hints:
-                if isinstance(hints[key], basestring):
+                if isinstance(hints[key], six.string_types):
                     hints[key] = [hints[key]]
                 hints[key] += [value]
             else:
diff --git a/novaclient/v3/shell.py b/novaclient/v3/shell.py
@@ -173,7 +173,7 @@ def _boot(cs, args, reservation_id=None, min_count=None, max_count=None):
             # NOTE(vish): multiple copies of the same hint will
             #             result in a list of values
             if key in hints:
-                if isinstance(hints[key], basestring):
+                if isinstance(hints[key], six.string_types):
                     hints[key] = [hints[key]]
                 hints[key] += [value]
             else:

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,8 @@ def test_boot_metadata(self):`
`461`	`461`	`)`
`462`	`462`
`463`	`463`	`def test_boot_hints(self):`
`464`		`- self.run_command('boot --image 1 --flavor 1 --hint a=b=c some-server ')`
	`464`	`+ self.run_command('boot --image 1 --flavor 1 '`
	`465`	`+ '--hint a=b0=c0 --hint a=b1=c1 some-server ')`
`465`	`466`	`self.assert_called_anytime(`
`466`	`467`	`'POST', '/servers',`
`467`	`468`	`{`
`@@ -472,7 +473,7 @@ def test_boot_hints(self):`
`472`	`473`	`'min_count': 1,`
`473`	`474`	`'max_count': 1,`
`474`	`475`	`},`
`475`		`- 'os:scheduler_hints': {'a': 'b=c'},`
	`476`	`+ 'os:scheduler_hints': {'a': ['b0=c0', 'b1=c1']},`
`476`	`477`	`},`
`477`	`478`	`)`
`478`	`479`