update import

jadbin · Jul 14, 2018 · ec069f7 · ec069f7
1 parent e268127
commit ec069f7
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 23 deletions.
diff --git a/README.rst b/README.rst
@@ -24,8 +24,7 @@ Spider Example
 
 .. code-block:: python
 
-    from xpaw import Spider, HttpRequest, Selector
-    from xpaw.run import run_spider
+    from xpaw import Spider, HttpRequest, Selector, run_spider
 
 
     class TencentNewsSpider(Spider):

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -32,6 +32,7 @@ Refactoring
 - 调整了中间件加载顺序权值
 - HttpRequest对 ``auth`` 、 ``cookie_jar`` 、 ``proxy`` 、 ``proxy_auth`` 的配置移至 ``meta`` 属性中。
 - SetDupeFilter更名为HashDupeFilter
+- 修改aiohttp的版本限制为>=3.3.2
 
 0.9.1 (2018-04-16)
 ------------------
@@ -178,7 +179,7 @@ Refactoring
 Bug fixes
 ~~~~~~~~~
 
-- HttpResponse中的 ``url`` 字段源于aiohttp返回的ClientResponse中的 ``url`` 字段，实际应为 ``URL`` 对象
+- HttpResponse中的 ``url`` 字段源于aiohttp返回的ClientResponse中的 ``url`` 字段，实际应为 ``yarl.URL`` 对象
 
 Refactoring
 ~~~~~~~~~~~

diff --git a/docs/index.rst b/docs/index.rst
@@ -39,8 +39,7 @@ Spider Example
 
 .. code-block:: python
 
-    from xpaw import Spider, HttpRequest, Selector
-    from xpaw.run import run_spider
+    from xpaw import Spider, HttpRequest, Selector, run_spider
 
 
     class TencentNewsSpider(Spider):

diff --git a/docs/spider.rst b/docs/spider.rst
@@ -67,8 +67,7 @@ Cron Job
 
 .. code-block:: python
 
-    from xpaw import Spider, HttpRequest, Selector, every
-    from xpaw.run import run_spider
+    from xpaw import Spider, HttpRequest, Selector, every, run_spider
 
 
     class CronJobSpider(Spider):

diff --git a/docs/tutorial1.rst b/docs/tutorial1.rst
@@ -47,8 +47,7 @@ Spider Overview
     from urllib.parse import urljoin
     import json
 
-    from xpaw import Spider, HttpRequest, Selector
-    from xpaw.run import run_spider
+    from xpaw import Spider, HttpRequest, Selector, run_spider
 
 
     class QuotesSpider(Spider):

diff --git a/examples/async_generator_spider.py b/examples/async_generator_spider.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
-from xpaw import Spider, HttpRequest, Selector
-from xpaw.run import run_spider
+from xpaw import Spider, HttpRequest, Selector, run_spider
 
 
 class AsyncGeneratorSpider(Spider):

diff --git a/examples/cron_job_spider.py b/examples/cron_job_spider.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
-from xpaw import Spider, HttpRequest, Selector, every
-from xpaw.run import run_spider
+from xpaw import Spider, HttpRequest, Selector, every, run_spider
 
 
 class CronJobSpider(Spider):

diff --git a/examples/quote_spider.py b/examples/quote_spider.py
@@ -3,8 +3,7 @@
 from urllib.parse import urljoin
 import json
 
-from xpaw import Spider, HttpRequest, Selector
-from xpaw.run import run_spider
+from xpaw import Spider, HttpRequest, Selector, run_spider
 
 
 class QuotesSpider(Spider):

diff --git a/examples/tencent_news_spider.py b/examples/tencent_news_spider.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
-from xpaw import Spider, HttpRequest, Selector
-from xpaw.run import run_spider
+from xpaw import Spider, HttpRequest, Selector, run_spider
 
 
 class TencentNewsSpider(Spider):

diff --git a/examples/xpath_quote_spider.py b/examples/xpath_quote_spider.py
@@ -2,8 +2,7 @@
 
 from urllib.parse import urljoin
 
-from xpaw import Spider, HttpRequest, Selector
-from xpaw.run import run_spider
+from xpaw import Spider, HttpRequest, Selector, run_spider
 
 
 class XPathQuotesSpider(Spider):

diff --git a/xpaw/__init__.py b/xpaw/__init__.py
@@ -5,13 +5,19 @@
 
 from aiohttp import FormData
 
-from .spider import Spider, every
 from .http import HttpRequest, HttpResponse
-from .selector import Selector
 from .downloader import Downloader
+from .spider import Spider, every
+from .selector import Selector
 from .item import Item, Field
+from .run import run_spider, run_crawler
 
-__all__ = ('FormData', 'HttpRequest', 'HttpResponse', 'Downloader', 'Spider', 'Selector',
-           'Item', 'Field', 'every')
+__all__ = ('FormData',
+           'HttpRequest', 'HttpResponse',
+           'Downloader',
+           'Spider', 'every',
+           'Selector',
+           'Item', 'Field',
+           'run_spider', 'run_crawler')
 
 del _patch