converted scrapy.item package to module

--HG--
rename : scrapy/item/models.py => scrapy/item.py

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: <class 'dmoz.spiders.dmoz.OpenDirectorySpider'>
       hxs: <class 'scrapy.xpath.selector.HtmlXPathSelector'>
-      item: <class 'scrapy.item.models.ScrapedItem'>
+      item: <class 'scrapy.item.ScrapedItem'>
       response: <class 'scrapy.http.response.html.HtmlResponse'>
    Available commands:
       get [url]: Fetch a new URL or re-fetch current Request

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

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

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

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

scrapy/item/__init__.py

@@ -1 +0,0 @@
-from scrapy.item.models import ScrapedItem

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"""

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