[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

[terry.reedy]

http://hg.python.org/cpython/rev/46e6a8b742d9
changeset:   82673:46e6a8b742d9
parent:      82669:59292f366b53
parent:      82672:166fb6ecb55a
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Mar 15 16:51:21 2013 -0400
summary:
  Merge with 3.3

files:
  Doc/library/urllib.robotparser.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/urllib.robotparser.rst b/Doc/library/urllib.robotparser.rst
--- a/Doc/library/urllib.robotparser.rst
+++ b/Doc/library/urllib.robotparser.rst
@@ -19,10 +19,10 @@
 structure of :file:`robots.txt` files, see http://www.robotstxt.org/orig.html.
 
 
-.. class:: RobotFileParser()
+.. class:: RobotFileParser(url='')
 
-   This class provides a set of methods to read, parse and answer questions
-   about a single :file:`robots.txt` file.
+   This class provides methods to read, parse and answer questions about the
+   :file:`robots.txt` file at *url*.
 
    .. method:: set_url(url)
 

-- 
Repository URL: http://hg.python.org/cpython