Update documentation.

feifei114 · Dec 22, 2016 · 5e9c7f9 · 5e9c7f9
1 parent feed615
commit 5e9c7f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/docs/core/examples/stdiodemo.py b/docs/core/examples/stdiodemo.py
@@ -59,7 +59,8 @@ def do_quit(self):
 
     def do_check(self, url):
         """check <url>: Attempt to download the given web page"""
-        client.getPage(url).addCallback(
+        client.Agent(reactor).request('GET', url).addCallback(
+            client.readBody).addCallback(
             self.__checkSuccess).addErrback(
             self.__checkFailure)
 

diff --git a/docs/core/howto/threading.rst b/docs/core/howto/threading.rst
@@ -113,13 +113,14 @@ To get a result from some blocking code back into the reactor thread, we can use
 Similarly, you want some code running in a non-reactor thread wants to invoke some code in the reactor thread and get its result, you can use :api:`twisted.internet.threads.blockingCallFromThread <blockingCallFromThread>`::
 
     from twisted.internet import threads, reactor, defer
-    from twisted.web.client import getPage
+    from twisted.web.client import Agent
     from twisted.web.error import Error
 
     def inThread():
+        agent = Agent(reactor)
         try:
             result = threads.blockingCallFromThread(
-                reactor, getPage, "http://twistedmatrix.com/")
+                reactor, agent.request, "GET", "http://twistedmatrix.com/"))
         except Error, exc:
             print(exc)
         else:

diff --git a/docs/web/examples/index.rst b/docs/web/examples/index.rst
@@ -9,8 +9,9 @@ Examples
 twisted.web.client
 ------------------
 
-- :download:`getpage.py` - use ``twisted.web.client.getPage`` to download a web page.
-- :download:`dlpage.py` - add callbacks to ``twisted.web.client.downloadPage`` to display errors that occur when downloading a web page
+- :download:`httpclient.py` - use ``twisted.web.client.Agent`` to download a web page.
+- (deprecated) :download:`getpage.py` - use ``twisted.web.client.getPage`` to download a web page.
+- (deprecated) :download:`dlpage.py` - add callbacks to ``twisted.web.client.downloadPage`` to display errors that occur when downloading a web page
 
 
 XML-RPC