Replace str.find()!=1 with the more readable "in" operator.
This commit is contained in:
parent
c5e378da41
commit
bac788a3cd
|
@ -554,7 +554,7 @@ class ConfigParser(RawConfigParser):
|
|||
depth = MAX_INTERPOLATION_DEPTH
|
||||
while depth: # Loop through this until it's done
|
||||
depth -= 1
|
||||
if value.find("%(") != -1:
|
||||
if "%(" in value:
|
||||
try:
|
||||
value = value % vars
|
||||
except KeyError, e:
|
||||
|
@ -562,7 +562,7 @@ class ConfigParser(RawConfigParser):
|
|||
option, section, rawval, e[0])
|
||||
else:
|
||||
break
|
||||
if value.find("%(") != -1:
|
||||
if "%(" in value:
|
||||
raise InterpolationDepthError(option, section, rawval)
|
||||
return value
|
||||
|
||||
|
|
|
@ -250,7 +250,7 @@ class TimeRE(dict):
|
|||
format = regex_chars.sub(r"\\\1", format)
|
||||
whitespace_replacement = re_compile('\s+')
|
||||
format = whitespace_replacement.sub('\s*', format)
|
||||
while format.find('%') != -1:
|
||||
while '%' in format:
|
||||
directive_index = format.index('%')+1
|
||||
processed_format = "%s%s%s" % (processed_format,
|
||||
format[:directive_index-1],
|
||||
|
|
|
@ -289,7 +289,7 @@ class GNUTranslations(NullTranslations):
|
|||
# cause no problems since us-ascii should always be a subset of
|
||||
# the charset encoding. We may want to fall back to 8-bit msgids
|
||||
# if the Unicode conversion fails.
|
||||
if msg.find('\x00') >= 0:
|
||||
if '\x00' in msg:
|
||||
# Plural forms
|
||||
msgid1, msgid2 = msg.split('\x00')
|
||||
tmsg = tmsg.split('\x00')
|
||||
|
|
|
@ -348,7 +348,7 @@ class HTTPResponse:
|
|||
# An HTTP/1.1 proxy is assumed to stay open unless
|
||||
# explicitly closed.
|
||||
conn = self.msg.getheader('connection')
|
||||
if conn and conn.lower().find("close") >= 0:
|
||||
if conn and "close" in conn.lower():
|
||||
return True
|
||||
return False
|
||||
|
||||
|
@ -361,7 +361,7 @@ class HTTPResponse:
|
|||
|
||||
# Proxy-Connection is a netscape hack.
|
||||
pconn = self.msg.getheader('proxy-connection')
|
||||
if pconn and pconn.lower().find("keep-alive") >= 0:
|
||||
if pconn and "keep-alive" in pconn.lower():
|
||||
return False
|
||||
|
||||
# otherwise, assume it will close
|
||||
|
|
|
@ -63,7 +63,7 @@ def main():
|
|||
while 1:
|
||||
line = fp.readline()
|
||||
if not line: break
|
||||
if line.find('{1, "') > -1:
|
||||
if '{1, "' in line:
|
||||
match = strprog.search(line)
|
||||
if match:
|
||||
lines.append(" '" + match.group(1) + "',\n")
|
||||
|
|
|
@ -214,7 +214,7 @@ class Entry:
|
|||
# we have the catch-all agent
|
||||
return True
|
||||
agent = agent.lower()
|
||||
if useragent.find(agent) != -1:
|
||||
if agent in useragent:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ def get(using=None):
|
|||
else:
|
||||
alternatives = _tryorder
|
||||
for browser in alternatives:
|
||||
if browser.find('%s') > -1:
|
||||
if '%s' in browser:
|
||||
# User gave us a command line, don't mess with it.
|
||||
return GenericBrowser(browser)
|
||||
else:
|
||||
|
|
Loading…
Reference in New Issue