x
/
os-xenapi
Code Issues Proposed changes

Revert "Replace basestring with six.string_types" 

This reverts commit 5149040872.

Change-Id: I36e04cb0704607749319f0cf449122c08cd793f9
This commit is contained in:
Jianghua Wang 2017-07-16 03:10:30 +00:00
parent 5149040872
commit d1003f4f65
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os_xenapi/dom0/etc/xapi.d/plugins/xenhost.py
View File

@ -32,7 +32,6 @@ except ImportError:
import simplejson as json
import logging
import re
import six
import sys
import time
@ -376,7 +375,7 @@ ALLOWED_NETWORK_CMDS = {
def network_config(session, args):
"""network config functions"""
cmd = pluginlib.exists(args, 'cmd')
if not isinstance(cmd, six.string_types):
if not isinstance(cmd, basestring):
msg = "invalid command '%s'" % str(cmd)
raise pluginlib.PluginError(msg)
return