From 5aeab5b2916e3e2f0cb56a667b89ea7cd68bf7a0 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Wed, 12 Aug 2009 21:31:50 -0300 Subject: [PATCH] converted scrapy.item package to module --HG-- rename : scrapy/item/models.py => scrapy/item.py --- docs/intro/tutorial.rst | 2 +- scrapy/command/commands/parse.py | 2 +- scrapy/contrib/pipeline/__init__.py | 2 +- scrapy/contrib/spiders/feed.py | 2 +- scrapy/core/scraper.py | 2 +- scrapy/{item/models.py => item.py} | 0 scrapy/item/__init__.py | 1 - scrapy/newitem/__init__.py | 2 +- scrapy/utils/display.py | 2 +- 9 files changed, 7 insertions(+), 8 deletions(-) rename scrapy/{item/models.py => item.py} (100%) delete mode 100644 scrapy/item/__init__.py diff --git a/docs/intro/tutorial.rst b/docs/intro/tutorial.rst index f860ccedf..90de0b27c 100644 --- a/docs/intro/tutorial.rst +++ b/docs/intro/tutorial.rst @@ -239,7 +239,7 @@ This is what the shell looks like:: url: http://www.dmoz.org/Computers/Programming/Languages/Python/Books/ spider: hxs: - item: + item: response: Available commands: get [url]: Fetch a new URL or re-fetch current Request diff --git a/scrapy/command/commands/parse.py b/scrapy/command/commands/parse.py index 4ee9912e2..1321bf82a 100644 --- a/scrapy/command/commands/parse.py +++ b/scrapy/command/commands/parse.py @@ -1,7 +1,7 @@ from scrapy.command import ScrapyCommand from scrapy.fetcher import fetch from scrapy.http import Request -from scrapy.item.models import BaseItem +from scrapy.item import BaseItem from scrapy.spider import spiders from scrapy.utils import display from scrapy import log diff --git a/scrapy/contrib/pipeline/__init__.py b/scrapy/contrib/pipeline/__init__.py index 6efb1bd9b..cb6f3b326 100644 --- a/scrapy/contrib/pipeline/__init__.py +++ b/scrapy/contrib/pipeline/__init__.py @@ -6,7 +6,7 @@ See documentation in docs/item-pipeline.rst from scrapy import log from scrapy.core.exceptions import NotConfigured -from scrapy.item.models import BaseItem +from scrapy.item import BaseItem from scrapy.utils.misc import load_object from scrapy.utils.defer import defer_succeed, mustbe_deferred from scrapy.conf import settings diff --git a/scrapy/contrib/spiders/feed.py b/scrapy/contrib/spiders/feed.py index 674d4e9c3..87323efcb 100644 --- a/scrapy/contrib/spiders/feed.py +++ b/scrapy/contrib/spiders/feed.py @@ -6,7 +6,7 @@ See documentation in docs/ref/spiders.rst """ from scrapy.contrib.spiders.init import InitSpider -from scrapy.item.models import BaseItem +from scrapy.item import BaseItem from scrapy.http import Request from scrapy.utils.iterators import xmliter, csviter from scrapy.xpath.selector import XmlXPathSelector, HtmlXPathSelector diff --git a/scrapy/core/scraper.py b/scrapy/core/scraper.py index 8ed1d92e1..edfab036c 100644 --- a/scrapy/core/scraper.py +++ b/scrapy/core/scraper.py @@ -9,7 +9,7 @@ from scrapy.utils.misc import arg_to_iter, load_object from scrapy.core.exceptions import IgnoreRequest, DropItem from scrapy.core import signals from scrapy.http import Request, Response -from scrapy.item.models import BaseItem +from scrapy.item import BaseItem from scrapy.spider.middleware import SpiderMiddlewareManager from scrapy import log from scrapy.stats import stats diff --git a/scrapy/item/models.py b/scrapy/item.py similarity index 100% rename from scrapy/item/models.py rename to scrapy/item.py diff --git a/scrapy/item/__init__.py b/scrapy/item/__init__.py deleted file mode 100644 index 35982e691..000000000 --- a/scrapy/item/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from scrapy.item.models import ScrapedItem diff --git a/scrapy/newitem/__init__.py b/scrapy/newitem/__init__.py index ab3f2e283..540e09444 100644 --- a/scrapy/newitem/__init__.py +++ b/scrapy/newitem/__init__.py @@ -1,6 +1,6 @@ from UserDict import DictMixin -from scrapy.item.models import BaseItem +from scrapy.item import BaseItem class Field(dict): """Container of field metadata""" diff --git a/scrapy/utils/display.py b/scrapy/utils/display.py index 79fe79615..3caf716b1 100644 --- a/scrapy/utils/display.py +++ b/scrapy/utils/display.py @@ -4,7 +4,7 @@ Helper functions for formatting and pretty printing some objects import sys import pprint as pypprint -from scrapy.item.models import BaseItem +from scrapy.item import BaseItem from scrapy.http import Request, Response nocolour = False