mirror of
https://github.com/python/cpython.git
synced 2025-10-26 11:14:33 +00:00
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. ........
This commit is contained in:
parent
5f6f6eb0bf
commit
745e86b3f8
3 changed files with 21 additions and 2 deletions
|
|
@ -66,7 +66,9 @@ def read(self):
|
|||
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 @@ def parse(self, lines):
|
|||
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):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue