From 11e62117b745d4e489b0533873be48d09d19136a Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Thu, 10 Apr 2014 03:32:00 +0600 Subject: [PATCH] suggest scrapy.Selector in deprecation warnings --- scrapy/selector/lxmlsel.py | 8 ++++---- scrapy/tests/test_selector.py | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scrapy/selector/lxmlsel.py b/scrapy/selector/lxmlsel.py index 0234703cb..070cb2306 100644 --- a/scrapy/selector/lxmlsel.py +++ b/scrapy/selector/lxmlsel.py @@ -10,7 +10,7 @@ __all__ = ['HtmlXPathSelector', 'XmlXPathSelector', 'XPathSelector', def _xpathselector_css(self, *a, **kw): raise RuntimeError('.css() method not available for %s, ' - 'instantiate scrapy.selector.Selector ' + 'instantiate scrapy.Selector ' 'instead' % type(self).__name__) XPathSelector = create_deprecated_class( @@ -21,7 +21,7 @@ XPathSelector = create_deprecated_class( '_default_type': 'html', 'css': _xpathselector_css, }, - new_class_path='scrapy.selector.Selector', + new_class_path='scrapy.Selector', old_class_path='scrapy.selector.XPathSelector', ) @@ -32,7 +32,7 @@ XmlXPathSelector = create_deprecated_class( '__slots__': (), '_default_type': 'xml', }, - new_class_path='scrapy.selector.Selector', + new_class_path='scrapy.Selector', old_class_path='scrapy.selector.XmlXPathSelector', ) @@ -43,7 +43,7 @@ HtmlXPathSelector = create_deprecated_class( '__slots__': (), '_default_type': 'html', }, - new_class_path='scrapy.selector.Selector', + new_class_path='scrapy.Selector', old_class_path='scrapy.selector.HtmlXPathSelector', ) diff --git a/scrapy/tests/test_selector.py b/scrapy/tests/test_selector.py index 077ba2720..d60521cbc 100644 --- a/scrapy/tests/test_selector.py +++ b/scrapy/tests/test_selector.py @@ -354,7 +354,7 @@ class DeprecatedXpathSelectorTest(unittest.TestCase): # subclassing must issue a warning self.assertEqual(len(w), 1, str(cls)) - self.assertIn('scrapy.selector.Selector', str(w[0].message)) + self.assertIn('scrapy.Selector', str(w[0].message)) # subclass instance doesn't issue a warning usel = UserClass(text=self.text) @@ -363,7 +363,7 @@ class DeprecatedXpathSelectorTest(unittest.TestCase): # class instance must issue a warning sel = cls(text=self.text) self.assertEqual(len(w), 2, str((cls, [x.message for x in w]))) - self.assertIn('scrapy.selector.Selector', str(w[1].message)) + self.assertIn('scrapy.Selector', str(w[1].message)) # subclass and instance checks self.assertTrue(issubclass(cls, Selector)) @@ -378,7 +378,7 @@ class DeprecatedXpathSelectorTest(unittest.TestCase): # subclassing must issue a warning self.assertEqual(len(w), 1, str(cls)) - self.assertIn('scrapy.selector.Selector', str(w[0].message)) + self.assertIn('scrapy.Selector', str(w[0].message)) # subclass instance doesn't issue a warning usel = UserClass(text=self.text) @@ -387,7 +387,7 @@ class DeprecatedXpathSelectorTest(unittest.TestCase): # class instance must issue a warning sel = cls(text=self.text) self.assertEqual(len(w), 2, str((cls, [x.message for x in w]))) - self.assertIn('scrapy.selector.Selector', str(w[1].message)) + self.assertIn('scrapy.Selector', str(w[1].message)) # subclass and instance checks self.assertTrue(issubclass(cls, Selector)) @@ -405,7 +405,7 @@ class DeprecatedXpathSelectorTest(unittest.TestCase): # subclassing must issue a warning self.assertEqual(len(w), 1, str(cls)) - self.assertIn('scrapy.selector.Selector', str(w[0].message)) + self.assertIn('scrapy.Selector', str(w[0].message)) # subclass instance doesn't issue a warning usel = UserClass(text=self.text) @@ -414,7 +414,7 @@ class DeprecatedXpathSelectorTest(unittest.TestCase): # class instance must issue a warning sel = cls(text=self.text) self.assertEqual(len(w), 2, str((cls, [x.message for x in w]))) - self.assertIn('scrapy.selector.Selector', str(w[1].message)) + self.assertIn('scrapy.Selector', str(w[1].message)) # subclass and instance checks self.assertTrue(issubclass(cls, Selector))