bpo-31325: Fix usage of namedtuple in RobotFileParser.parse() (#4529)
diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py
index 5c1a571..75198b7 100644
--- a/Lib/test/test_robotparser.py
+++ b/Lib/test/test_robotparser.py
@@ -3,7 +3,6 @@
import threading
import unittest
import urllib.robotparser
-from collections import namedtuple
from test import support
from http.server import BaseHTTPRequestHandler, HTTPServer
@@ -87,6 +86,10 @@
self.parser.crawl_delay(agent), self.crawl_delay
)
if self.request_rate:
+ self.assertIsInstance(
+ self.parser.request_rate(agent),
+ urllib.robotparser.RequestRate
+ )
self.assertEqual(
self.parser.request_rate(agent).requests,
self.request_rate.requests
@@ -108,7 +111,7 @@
Disallow: /%7ejoe/index.html
"""
agent = 'figtree'
- request_rate = namedtuple('req_rate', 'requests seconds')(9, 30)
+ request_rate = urllib.robotparser.RequestRate(9, 30)
crawl_delay = 3
good = [('figtree', '/foo.html')]
bad = ['/tmp', '/tmp.html', '/tmp/a.html', '/a%3cd.html', '/a%3Cd.html',
@@ -237,7 +240,7 @@
Request-rate: 3/15
Disallow: /cyberworld/map/
"""
- request_rate = namedtuple('req_rate', 'requests seconds')(3, 15)
+ request_rate = urllib.robotparser.RequestRate(3, 15)
crawl_delay = 1
good = ['/', '/test.html']
bad = ['/cyberworld/map/index.html']
diff --git a/Lib/urllib/robotparser.py b/Lib/urllib/robotparser.py
index 9dab4c1..daac29c 100644
--- a/Lib/urllib/robotparser.py
+++ b/Lib/urllib/robotparser.py
@@ -16,6 +16,9 @@
__all__ = ["RobotFileParser"]
+RequestRate = collections.namedtuple("RequestRate", "requests seconds")
+
+
class RobotFileParser:
""" This class provides a set of methods to read, parse and answer
questions about a single robots.txt file.
@@ -136,11 +139,7 @@
# check if all values are sane
if (len(numbers) == 2 and numbers[0].strip().isdigit()
and numbers[1].strip().isdigit()):
- req_rate = collections.namedtuple('req_rate',
- 'requests seconds')
- entry.req_rate = req_rate
- entry.req_rate.requests = int(numbers[0])
- entry.req_rate.seconds = int(numbers[1])
+ entry.req_rate = RequestRate(int(numbers[0]), int(numbers[1]))
state = 2
if state == 2:
self._add_entry(entry)