From a0e2086b1bab227b79d1668f9aa400ba65abe610 Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Mon, 10 Aug 2009 21:02:46 -0300
Subject: [PATCH] moved deprecated scrapy.item.adaptors to scrapy.contrib.item,
 and added deprecation warning

--HG--
rename : scrapy/item/adaptors.py => scrapy/contrib/item/adaptors.py
---
 scrapy/contrib/item/__init__.py        | 10 ++++++++++
 scrapy/{ => contrib}/item/adaptors.py  |  0
 scrapy/contrib/item/models.py          |  3 ++-
 scrapy/contrib_exp/adaptors/misc.py    |  2 +-
 scrapy/tests/test_adaptors.py          |  2 +-
 scrapy/tests/test_robustscrapeditem.py |  2 +-
 6 files changed, 15 insertions(+), 4 deletions(-)
 rename scrapy/{ => contrib}/item/adaptors.py (100%)

diff --git a/scrapy/contrib/item/__init__.py b/scrapy/contrib/item/__init__.py
index a6226fec9..7d173ce53 100644
--- a/scrapy/contrib/item/__init__.py
+++ b/scrapy/contrib/item/__init__.py
@@ -1 +1,11 @@
+"""
+WARNING: This module is obsolete and will be removed before the Scrapy 0.7
+release
+"""
+
+import warnings
+
 from scrapy.contrib.item.models import RobustScrapedItem, RobustItemDelta, ValidationError, ValidationPipeline
+
+warnings.warn("scrapy.contrib.item is obsolete and will be removed soon", \
+                DeprecationWarning, stacklevel=2)
diff --git a/scrapy/item/adaptors.py b/scrapy/contrib/item/adaptors.py
similarity index 100%
rename from scrapy/item/adaptors.py
rename to scrapy/contrib/item/adaptors.py
diff --git a/scrapy/contrib/item/models.py b/scrapy/contrib/item/models.py
index 015e2ee0c..8082e6e19 100644
--- a/scrapy/contrib/item/models.py
+++ b/scrapy/contrib/item/models.py
@@ -5,11 +5,12 @@ useful in some Scrapy implementations
 
 import copy
 import hashlib
+import warnings
 
 from pprint import PrettyPrinter
 
 from scrapy.item import ScrapedItem
-from scrapy.item.adaptors import AdaptorPipe
+from scrapy.contrib.item.adaptors import AdaptorPipe
 from scrapy.core.exceptions import DropItem
 from scrapy.utils.python import unique
 
diff --git a/scrapy/contrib_exp/adaptors/misc.py b/scrapy/contrib_exp/adaptors/misc.py
index 4fd5153c1..c7d9ec6d4 100644
--- a/scrapy/contrib_exp/adaptors/misc.py
+++ b/scrapy/contrib_exp/adaptors/misc.py
@@ -4,7 +4,7 @@ import re
 from scrapy.xpath.selector import XPathSelector, XPathSelectorList
 from scrapy.utils.misc import extract_regex
 from scrapy.utils.python import flatten, str_to_unicode, unicode_to_str
-from scrapy.item.adaptors import adaptize
+from scrapy.contrib.item.adaptors import adaptize
 
 def to_unicode(value, adaptor_args):
     """
diff --git a/scrapy/tests/test_adaptors.py b/scrapy/tests/test_adaptors.py
index 2de1e5740..233d1f530 100644
--- a/scrapy/tests/test_adaptors.py
+++ b/scrapy/tests/test_adaptors.py
@@ -2,7 +2,7 @@
 import unittest
 import re
 
-from scrapy.item.adaptors import AdaptorPipe
+from scrapy.contrib.item.adaptors import AdaptorPipe
 from scrapy.contrib_exp import adaptors
 from scrapy.http import HtmlResponse, Headers
 from scrapy.xpath.selector import HtmlXPathSelector, XmlXPathSelector
diff --git a/scrapy/tests/test_robustscrapeditem.py b/scrapy/tests/test_robustscrapeditem.py
index 7067384c2..7cac5a45e 100644
--- a/scrapy/tests/test_robustscrapeditem.py
+++ b/scrapy/tests/test_robustscrapeditem.py
@@ -2,7 +2,7 @@
 import unittest
 
 from scrapy.contrib.item import RobustScrapedItem
-from scrapy.item.adaptors import AdaptorPipe
+from scrapy.contrib.item.adaptors import AdaptorPipe
 from scrapy.contrib_exp import adaptors
 
 class MyItem(RobustScrapedItem):