mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 01:05:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Patch #1014237: Consistently return booleans throughout.

Browse source
This commit is contained in:
Martin v. Löwis 2004-08-23 20:42:35 +00:00
parent 07fda7e3a0
commit 31bd529f53
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/robotparser.py
View file

@ -28,8 +28,8 @@ class RobotFileParser:
def __init__(self, url=''): def __init__(self, url=''):
self.entries = [] self.entries = []
self.default_entry = None self.default_entry = None
self.disallow_all = 0 self.disallow_all = False
self.allow_all = 0 self.allow_all = False
self.set_url(url) self.set_url(url)
self.last_checked = 0 self.last_checked = 0
@ -66,10 +66,10 @@ class RobotFileParser:
line = f.readline() line = f.readline()
self.errcode = opener.errcode self.errcode = opener.errcode
if self.errcode == 401 or self.errcode == 403: if self.errcode == 401 or self.errcode == 403:
self.disallow_all = 1 self.disallow_all = True
_debug("disallow all") _debug("disallow all")
elif self.errcode >= 400: elif self.errcode >= 400:
self.allow_all = 1 self.allow_all = True
_debug("allow all") _debug("allow all")
elif self.errcode == 200 and lines: elif self.errcode == 200 and lines:
_debug("parse lines") _debug("parse lines")
@ -128,14 +128,14 @@ class RobotFileParser:
_debug("line %d: error: you must insert a user-agent:" _debug("line %d: error: you must insert a user-agent:"
" directive before this line" % linenumber) " directive before this line" % linenumber)
else: else:
entry.rulelines.append(RuleLine(line[1], 0)) entry.rulelines.append(RuleLine(line[1], False))
state = 2 state = 2
elif line[0] == "allow": elif line[0] == "allow":
if state==0: if state==0:
_debug("line %d: error: you must insert a user-agent:" _debug("line %d: error: you must insert a user-agent:"
" directive before this line" % linenumber) " directive before this line" % linenumber)
else: else:
entry.rulelines.append(RuleLine(line[1], 1)) entry.rulelines.append(RuleLine(line[1], True))
else: else:
_debug("line %d: warning: unknown key %s" % (linenumber, _debug("line %d: warning: unknown key %s" % (linenumber,
line[0])) line[0]))
@ -175,12 +175,12 @@ class RobotFileParser:
class RuleLine: class RuleLine:
"""A rule line is a single "Allow:" (allowance==1) or "Disallow:" """A rule line is a single "Allow:" (allowance==True) or "Disallow:"
(allowance==0) followed by a path.""" (allowance==False) followed by a path."""
def __init__(self, path, allowance): def __init__(self, path, allowance):
if path == '' and not allowance: if path == '' and not allowance:
# an empty value means allow all # an empty value means allow all
allowance = 1 allowance = True
self.path = urllib.quote(path) self.path = urllib.quote(path)
self.allowance = allowance self.allowance = allowance
@ -226,7 +226,7 @@ class Entry:
_debug((filename, str(line), line.allowance)) _debug((filename, str(line), line.allowance))
if line.applies_to(filename): if line.applies_to(filename):
return line.allowance return line.allowance
return 1 return True
class URLopener(urllib.FancyURLopener): class URLopener(urllib.FancyURLopener):
def __init__(self, *args): def __init__(self, *args):