diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 20:57:27 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 20:57:27 (GMT) |
| commit | 745e86b3f81463ab1a18e63374f27a522a0a784f (patch) | |
| tree | 7d176a591a23c53d5d80c7f900b8c4a998617e29 /Lib/urllib | |
| parent | 5f6f6eb0bff52841ee18e5c6a96fe3600f44693d (diff) | |
| download | cpython-745e86b3f81463ab1a18e63374f27a522a0a784f.zip cpython-745e86b3f81463ab1a18e63374f27a522a0a784f.tar.gz cpython-745e86b3f81463ab1a18e63374f27a522a0a784f.tar.bz2 | |
Merged revisions 83238 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83238 | georg.brandl | 2010-07-29 19:55:01 +0200 (Do, 29 Jul 2010) | 1 line
#4108: the first default entry (User-agent: *) wins.
........
Diffstat (limited to 'Lib/urllib')
| -rw-r--r-- | Lib/urllib/robotparser.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/urllib/robotparser.py b/Lib/urllib/robotparser.py index 30baa05..75be4af 100644 --- a/Lib/urllib/robotparser.py +++ b/Lib/urllib/robotparser.py @@ -66,7 +66,9 @@ class RobotFileParser: def _add_entry(self, entry): if "*" in entry.useragents: # the default entry is considered last - self.default_entry = entry + if self.default_entry is None: + # the first default entry wins + self.default_entry = entry else: self.entries.append(entry) @@ -118,7 +120,7 @@ class RobotFileParser: entry.rulelines.append(RuleLine(line[1], True)) state = 2 if state == 2: - self.entries.append(entry) + self._add_entry(entry) def can_fetch(self, useragent, url): |