Skip to content
Permalink
Browse files

Python 3: Removed basestring

Change-Id: I8a947c55d6b610162daa1d70b51da9ceb8e1d927
  • Loading branch information...
si-23 committed Oct 1, 2019
1 parent df50b52 commit 46dadc7902a1c6303fcf4abba27c2b818ee4c252
Showing with 3 additions and 3 deletions.
  1. +1 −1 .pylintrc
  2. +1 −1 checks/check_dns
  3. +1 −1 checks/if.include
@@ -22,7 +22,7 @@ jobs=0
# TODO: Why do we need persistence?
persistent=yes
extension-pkg-whitelist=rrdtool,_ldap,netifaces,pymssql
bad-functions=unicode,file,cmp,apply,execfile,reduce,reload
bad-functions=basestring,unicode,file,cmp,apply,execfile,reduce,reload

[MESSAGES CONTROL]
disable=
@@ -39,7 +39,7 @@ def check_dns_arguments(params):
# Convert from old (str) to new (list of strings)
exp = settings["expected_address"]
# TODO: Use six.string_types when this is a module.
if isinstance(exp, basestring):
if isinstance(exp, six.string_types):
exp = [exp]
for entry in exp:
args += ["-a", entry]
@@ -139,7 +139,7 @@ def need_if64adm():
def fix_if_64_highspeed(info):
for line in info:
# TODO: Use six.string_types when this is a module.
if isinstance(line[3], basestring): # not yet converted
if isinstance(line[3], six.string_types): # not yet converted
line[3] = saveint(line[3]) * 1000000


0 comments on commit 46dadc7

Please sign in to comment.
You can’t perform that action at this time.