From nobody Thu May 15 00:02:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521130284705657.1345792176356; Thu, 15 Mar 2018 09:11:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4441FC01CB63; Thu, 15 Mar 2018 16:11:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 15E5B60244; Thu, 15 Mar 2018 16:11:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CF9954CA9C; Thu, 15 Mar 2018 16:11:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2FGBIRN006852 for ; Thu, 15 Mar 2018 12:11:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 200042026E04; Thu, 15 Mar 2018 16:11:18 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA2892026E03 for ; Thu, 15 Mar 2018 16:11:17 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 15 Mar 2018 17:11:06 +0100 Message-Id: <20180315161110.17925-5-abologna@redhat.com> In-Reply-To: <20180315161110.17925-1-abologna@redhat.com> References: <20180315161110.17925-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 4/8] python3: Remove uses of string.*() functions X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 15 Mar 2018 16:11:23 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" All of these have been replaced with methods. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/apibuild.py | 142 +++++++++++++++++++++++++++------------------------= ---- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index e448e37ace..2097400cd1 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -122,11 +122,11 @@ hidden_macros =3D { } =20 def escape(raw): - raw =3D string.replace(raw, '&', '&') - raw =3D string.replace(raw, '<', '<') - raw =3D string.replace(raw, '>', '>') - raw =3D string.replace(raw, "'", ''') - raw =3D string.replace(raw, '"', '"') + raw =3D raw.replace('&', '&') + raw =3D raw.replace('<', '<') + raw =3D raw.replace('>', '>') + raw =3D raw.replace("'", ''') + raw =3D raw.replace('"', '"') return raw =20 def uniq(items): @@ -440,16 +440,16 @@ class CLexer: if not line: return None self.lineno =3D self.lineno + 1 - line =3D string.lstrip(line) - line =3D string.rstrip(line) + line =3D line.lstrip() + line =3D line.rstrip() if line =3D=3D '': continue while line[-1] =3D=3D '\\': line =3D line[:-1] n =3D self.input.readline() self.lineno =3D self.lineno + 1 - n =3D string.lstrip(n) - n =3D string.rstrip(n) + n =3D n.lstrip() + n =3D n.rstrip() if not n: break else: @@ -478,8 +478,8 @@ class CLexer: return None =20 if line[0] =3D=3D '#': - self.tokens =3D map((lambda x: ('preproc', x)), - string.split(line)) + self.tokens =3D list(map((lambda x: ('preproc', x)), + line.split())) =20 # We might have whitespace between the '#' and preproc # macro name, so instead of having a single token element @@ -572,21 +572,21 @@ class CLexer: while i < l: o =3D ord(line[i]) if (o >=3D 97 and o <=3D 122) or (o >=3D 65 and o = <=3D 90) or \ - (o >=3D 48 and o <=3D 57) or string.find( - " \t(){}:;,+-*/%&!|[]=3D><", line[i]) =3D= =3D -1: + (o >=3D 48 and o <=3D 57) or \ + (" \t(){}:;,+-*/%&!|[]=3D><".find(line[i]) =3D= =3D -1): i =3D i + 1 else: break self.tokens.append(('name', line[s:i])) continue - if string.find("(){}:;,[]", line[i]) !=3D -1: + if "(){}:;,[]".find(line[i]) !=3D -1: # if line[i] =3D=3D '(' or line[i] =3D=3D ')' or line[i] = =3D=3D '{' or \ # line[i] =3D=3D '}' or line[i] =3D=3D ':' or line[i] = =3D=3D ';' or \ # line[i] =3D=3D ',' or line[i] =3D=3D '[' or line[i] = =3D=3D ']': self.tokens.append(('sep', line[i])) i =3D i + 1 continue - if string.find("+-*><=3D/%&!|.", line[i]) !=3D -1: + if "+-*><=3D/%&!|.".find(line[i]) !=3D -1: # if line[i] =3D=3D '+' or line[i] =3D=3D '-' or line[i] = =3D=3D '*' or \ # line[i] =3D=3D '>' or line[i] =3D=3D '<' or line[i] = =3D=3D '=3D' or \ # line[i] =3D=3D '/' or line[i] =3D=3D '%' or line[i] = =3D=3D '&' or \ @@ -599,7 +599,7 @@ class CLexer: =20 j =3D i + 1 if j < l and ( - string.find("+-*><=3D/%&!|", line[j]) !=3D -1): + "+-*><=3D/%&!|".find(line[j]) !=3D -1): # line[j] =3D=3D '+' or line[j] =3D=3D '-' or line[j= ] =3D=3D '*' or \ # line[j] =3D=3D '>' or line[j] =3D=3D '<' or line[j= ] =3D=3D '=3D' or \ # line[j] =3D=3D '/' or line[j] =3D=3D '%' or line[j= ] =3D=3D '&' or \ @@ -614,8 +614,8 @@ class CLexer: while i < l: o =3D ord(line[i]) if (o >=3D 97 and o <=3D 122) or (o >=3D 65 and o <=3D= 90) or \ - (o >=3D 48 and o <=3D 57) or ( - string.find(" \t(){}:;,+-*/%&!|[]=3D><", line[i]) = =3D=3D -1): + (o >=3D 48 and o <=3D 57) or \ + (" \t(){}:;,+-*/%&!|[]=3D><".find(line[i]) =3D=3D -= 1): # line[i] !=3D ' ' and line[i] !=3D '\t' and # line[i] !=3D '(' and line[i] !=3D ')' and # line[i] !=3D '{' and line[i] !=3D '}' and @@ -714,7 +714,7 @@ class CParser: =20 def parseTopComment(self, comment): res =3D {} - lines =3D string.split(comment, "\n") + lines =3D comment.split("\n") item =3D None for line in lines: line =3D line.lstrip().lstrip('*').lstrip() @@ -763,10 +763,10 @@ class CParser: self.comment =3D self.comment + com token =3D self.lexer.token() =20 - if string.find(self.comment, "DOC_DISABLE") !=3D -1: + if self.comment.find("DOC_DISABLE") !=3D -1: self.stop_error() =20 - if string.find(self.comment, "DOC_ENABLE") !=3D -1: + if self.comment.find("DOC_ENABLE") !=3D -1: self.start_error() =20 return token @@ -789,7 +789,7 @@ class CParser: if not quiet: self.warning("Missing * in type comment for %s" % (name)) return((args, desc)) - lines =3D string.split(self.comment, '\n') + lines =3D self.comment.split('\n') if lines[0] =3D=3D '*': del lines[0] if lines[0] !=3D "* %s:" % (name): @@ -805,11 +805,11 @@ class CParser: l =3D lines[0] while len(l) > 0 and l[0] =3D=3D '*': l =3D l[1:] - l =3D string.strip(l) + l =3D l.strip() desc =3D desc + " " + l del lines[0] =20 - desc =3D string.strip(desc) + desc =3D desc.strip() =20 if quiet =3D=3D 0: if desc =3D=3D "": @@ -838,7 +838,7 @@ class CParser: if not quiet: self.warning("Missing * in macro comment for %s" % (name)) return((args, desc)) - lines =3D string.split(self.comment, '\n') + lines =3D self.comment.split('\n') if lines[0] =3D=3D '*': del lines[0] if lines[0] !=3D "* %s:" % (name): @@ -852,9 +852,9 @@ class CParser: while len(lines) > 0 and lines[0][0:3] =3D=3D '* @': l =3D lines[0][3:] try: - (arg, desc) =3D string.split(l, ':', 1) - desc=3Dstring.strip(desc) - arg=3Dstring.strip(arg) + (arg, desc) =3D l.split(':', 1) + desc =3D desc.strip() + arg =3D arg.strip() except: if not quiet: self.warning("Misformatted macro comment for %s" % (na= me)) @@ -862,11 +862,11 @@ class CParser: del lines[0] continue del lines[0] - l =3D string.strip(lines[0]) + l =3D lines[0].strip() while len(l) > 2 and l[0:3] !=3D '* @': while l[0] =3D=3D '*': l =3D l[1:] - desc =3D desc + ' ' + string.strip(l) + desc =3D desc + ' ' + l.strip() del lines[0] if len(lines) =3D=3D 0: break @@ -879,11 +879,11 @@ class CParser: l =3D lines[0] while len(l) > 0 and l[0] =3D=3D '*': l =3D l[1:] - l =3D string.strip(l) + l =3D l.strip() desc =3D desc + " " + l del lines[0] =20 - desc =3D string.strip(desc) + desc =3D desc.strip() =20 if quiet =3D=3D 0: if desc =3D=3D "": @@ -918,7 +918,7 @@ class CParser: if not quiet: self.warning("Missing * in function comment for %s" % (nam= e)) return(((ret[0], retdesc), args, desc)) - lines =3D string.split(self.comment, '\n') + lines =3D self.comment.split('\n') if lines[0] =3D=3D '*': del lines[0] if lines[0] !=3D "* %s:" % (name): @@ -933,9 +933,9 @@ class CParser: while len(lines) > 0 and lines[0][0:3] =3D=3D '* @': l =3D lines[0][3:] try: - (arg, desc) =3D string.split(l, ':', 1) - desc=3Dstring.strip(desc) - arg=3Dstring.strip(arg) + (arg, desc) =3D l.split(':', 1) + desc =3D desc.strip() + arg =3D arg.strip() except: if not quiet: self.warning("Misformatted function comment for %s" % = (name)) @@ -943,11 +943,11 @@ class CParser: del lines[0] continue del lines[0] - l =3D string.strip(lines[0]) + l =3D lines[0].strip() while len(l) > 2 and l[0:3] !=3D '* @': while l[0] =3D=3D '*': l =3D l[1:] - desc =3D desc + ' ' + string.strip(l) + desc =3D desc + ' ' + l.strip() del lines[0] if len(lines) =3D=3D 0: break @@ -978,16 +978,16 @@ class CParser: l =3D l[i:] if len(l) >=3D 6 and l[0:7] =3D=3D "Returns": try: - l =3D string.split(l, ' ', 1)[1] + l =3D l.split(' ', 1)[1] except: l =3D "" - retdesc =3D string.strip(l) + retdesc =3D l.strip() del lines[0] while len(lines) > 0: l =3D lines[0] while len(l) > 0 and l[0] =3D=3D '*': l =3D l[1:] - l =3D string.strip(l) + l =3D l.strip() retdesc =3D retdesc + " " + l del lines[0] else: @@ -999,8 +999,8 @@ class CParser: =20 if desc is None: desc =3D "" - retdesc =3D string.strip(retdesc) - desc =3D string.strip(desc) + retdesc =3D retdesc.strip() + desc =3D desc.strip() =20 if quiet =3D=3D 0: # @@ -1046,7 +1046,7 @@ class CParser: lst.append(token[1]) token =3D self.lexer.token() try: - name =3D string.split(name, '(') [0] + name =3D name.split('(') [0] except: pass =20 @@ -1083,7 +1083,7 @@ class CParser: apstr =3D self.lexer.tokens[0][1] try: self.defines.append(apstr) - if string.find(apstr, 'ENABLED') !=3D -1: + if apstr.find('ENABLED') !=3D -1: self.conditionals.append("defined(%s)" % apstr) except: pass @@ -1091,7 +1091,7 @@ class CParser: apstr =3D self.lexer.tokens[0][1] try: self.defines.append(apstr) - if string.find(apstr, 'ENABLED') !=3D -1: + if apstr.find('ENABLED') !=3D -1: self.conditionals.append("!defined(%s)" % apstr) except: pass @@ -1103,17 +1103,17 @@ class CParser: apstr =3D apstr + tok[1] try: self.defines.append(apstr) - if string.find(apstr, 'ENABLED') !=3D -1: + if apstr.find('ENABLED') !=3D -1: self.conditionals.append(apstr) except: pass elif name =3D=3D "#else": if self.conditionals !=3D [] and \ - string.find(self.defines[-1], 'ENABLED') !=3D -1: + self.defines[-1].find('ENABLED') !=3D -1: self.conditionals[-1] =3D "!(%s)" % self.conditionals[-1] elif name =3D=3D "#endif": if self.conditionals !=3D [] and \ - string.find(self.defines[-1], 'ENABLED') !=3D -1: + self.defines[-1].find('ENABLED') !=3D -1: self.conditionals =3D self.conditionals[:-1] self.defines =3D self.defines[:-1] token =3D self.lexer.token() @@ -1181,7 +1181,7 @@ class CParser: name =3D token[1] signature =3D self.signature if signature is not None: - type =3D string.split(type, '(')[0] + type =3D type.split('(')[0] d =3D self.mergeFunctionComment(name, ((type, None), signature), 1) self.index_add(name, self.filename, not self.is_header, @@ -1388,7 +1388,7 @@ class CParser: self.cleanupComment() if name is not None: if self.comment is not None: - comment =3D string.strip(self.comment) + comment =3D self.comment.strip() self.comment =3D None self.enums.append((name, value, comment)) name =3D token[1] @@ -2076,26 +2076,26 @@ class docBuilder: def indexString(self, id, str): if str is None: return - str =3D string.replace(str, "'", ' ') - str =3D string.replace(str, '"', ' ') - str =3D string.replace(str, "/", ' ') - str =3D string.replace(str, '*', ' ') - str =3D string.replace(str, "[", ' ') - str =3D string.replace(str, "]", ' ') - str =3D string.replace(str, "(", ' ') - str =3D string.replace(str, ")", ' ') - str =3D string.replace(str, "<", ' ') - str =3D string.replace(str, '>', ' ') - str =3D string.replace(str, "&", ' ') - str =3D string.replace(str, '#', ' ') - str =3D string.replace(str, ",", ' ') - str =3D string.replace(str, '.', ' ') - str =3D string.replace(str, ';', ' ') - tokens =3D string.split(str) + str =3D str.replace("'", ' ') + str =3D str.replace('"', ' ') + str =3D str.replace("/", ' ') + str =3D str.replace('*', ' ') + str =3D str.replace("[", ' ') + str =3D str.replace("]", ' ') + str =3D str.replace("(", ' ') + str =3D str.replace(")", ' ') + str =3D str.replace("<", ' ') + str =3D str.replace('>', ' ') + str =3D str.replace("&", ' ') + str =3D str.replace('#', ' ') + str =3D str.replace(",", ' ') + str =3D str.replace('.', ' ') + str =3D str.replace(';', ' ') + tokens =3D str.split() for token in tokens: try: c =3D token[0] - if string.find(string.letters, c) < 0: + if string.letters.find(c) < 0: pass elif len(token) < 3: pass @@ -2137,7 +2137,7 @@ class docBuilder: for file in files: skip =3D 1 for incl in self.includes: - if string.find(file, incl) !=3D -1: + if file.find(incl) !=3D -1: skip =3D 0 break if skip =3D=3D 0: @@ -2146,7 +2146,7 @@ class docBuilder: for file in files: skip =3D 1 for incl in self.includes: - if string.find(file, incl) !=3D -1: + if file.find(incl) !=3D -1: skip =3D 0 break if skip =3D=3D 0: @@ -2334,7 +2334,7 @@ class docBuilder: self.warning("Header %s lacks a %s description" % (mod= ule, data)) if 'Description' in dict.info: desc =3D dict.info['Description'] - if string.find(desc, "DEPRECATED") !=3D -1: + if desc.find("DEPRECATED") !=3D -1: output.write(" \n") =20 ids =3D dict.macros.keys() --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list