Skip to content

Commit

Permalink
Merge pull request #334 from mshriver/py3-compat-basestring
Browse files Browse the repository at this point in the history
Remove basestring for py3 compatibility
  • Loading branch information
mshriver authored Sep 24, 2018
2 parents 3543757 + 06a978b commit 076eee2
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions wrapanapi/entities/vm.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
Methods/classes pertaining to performing actions on a VM/instance
"""
from abc import ABCMeta, abstractmethod, abstractproperty
import time
from abc import ABCMeta, abstractmethod, abstractproperty
from six import string_types

from cached_property import cached_property_with_ttl
from wait_for import wait_for, TimedOutError
Expand Down Expand Up @@ -36,7 +37,7 @@ class VmState(object):
def valid_states(cls):
return [
var_val for _, var_val in vars(cls).items()
if isinstance(var_val, basestring) and var_val.startswith('VmState.')
if isinstance(var_val, string_types) and var_val.startswith('VmState.')
]


Expand Down

0 comments on commit 076eee2

Please sign in to comment.