From d75afaa161c723db0236e0e50233b95eb3e30a9c Mon Sep 17 00:00:00 2001
From: Ismael Carnales <icarnales@gmail.com>
Date: Mon, 13 Jul 2009 15:54:46 -0300
Subject: [PATCH] renamed StringField to TextField

---
 docs/proposed/newitem-fields.rst     |  6 +++---
 docs/proposed/newitem.rst            |  4 ++--
 scrapy/contrib_exp/newitem/fields.py |  4 ++--
 scrapy/tests/test_newitem.py         | 22 +++++++++++-----------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/proposed/newitem-fields.rst b/docs/proposed/newitem-fields.rst
index 39cd4ae9e..dd2895f14 100644
--- a/docs/proposed/newitem-fields.rst
+++ b/docs/proposed/newitem-fields.rst
@@ -20,10 +20,10 @@ The default value for the field.
 Field types
 ===========
 
-StringField
------------
+TextField
+---------
 
-.. class:: StringField
+.. class:: TextField
 
     A text field.
 
diff --git a/docs/proposed/newitem.rst b/docs/proposed/newitem.rst
index 518ffa594..74cafac21 100644
--- a/docs/proposed/newitem.rst
+++ b/docs/proposed/newitem.rst
@@ -41,8 +41,8 @@ To use this items you first define the item's fields as class attributes::
    from scrapy.contrib_exp.newitem import fields
 
    class NewsItem(Item):
-       headline = fields.StringField()
-       content = fields.StringField()
+       headline = fields.TextField()
+       content = fields.TextField()
        published = fields.DateField()
 
 And then you instantiate the item and assign values to its fields, which will be
diff --git a/scrapy/contrib_exp/newitem/fields.py b/scrapy/contrib_exp/newitem/fields.py
index 9d4e6bb7a..94c30eac6 100644
--- a/scrapy/contrib_exp/newitem/fields.py
+++ b/scrapy/contrib_exp/newitem/fields.py
@@ -106,7 +106,7 @@ class IntegerField(BaseField):
         return int(value) if value is not None else None
 
 
-class StringField(BaseField):
+class TextField(BaseField):
     def to_python(self, value):
         if hasattr(value, '__iter__'):
             return self.to_python(self.to_single(value))
@@ -115,7 +115,7 @@ class StringField(BaseField):
         elif value is None:
             return value
         else:
-            raise ValueError("StringField expects a basestring, got %s" \
+            raise ValueError("TextField expects a basestring, got %s" \
                 % type(value).__name__)
 
     def to_single(self, value):
diff --git a/scrapy/tests/test_newitem.py b/scrapy/tests/test_newitem.py
index 48e3254e1..584637efd 100644
--- a/scrapy/tests/test_newitem.py
+++ b/scrapy/tests/test_newitem.py
@@ -10,7 +10,7 @@ class NewItemTest(unittest.TestCase):
 
     def test_simple(self):
         class TestItem(Item):
-            name = fields.StringField()
+            name = fields.TextField()
 
         i = TestItem()
         i.name = 'name'
@@ -18,7 +18,7 @@ class NewItemTest(unittest.TestCase):
 
     def test_init(self):
         class TestItem(Item):
-            name = fields.StringField()
+            name = fields.TextField()
         
         i = TestItem()
         assert i.name is None
@@ -32,8 +32,8 @@ class NewItemTest(unittest.TestCase):
 
     def test_multi(self):
         class TestMultiItem(Item):
-            name = fields.StringField()
-            names = fields.MultiValuedField(fields.StringField)
+            name = fields.TextField()
+            names = fields.MultiValuedField(fields.TextField)
 
         i = TestMultiItem()
         i.name = 'name'
@@ -57,14 +57,14 @@ class NewItemTest(unittest.TestCase):
 
     def test_default_value(self):
         class TestItem(Item):
-            name = fields.StringField(default='John')
+            name = fields.TextField(default='John')
  
         i = TestItem()
         assert i.name == 'John'
 
     def test_to_python_iter(self):
         class TestItem(Item):
-            name = fields.StringField()
+            name = fields.TextField()
  
         i = TestItem()
         i.name = ('John', 'Doe')
@@ -72,7 +72,7 @@ class NewItemTest(unittest.TestCase):
 
     def test_repr(self):
         class TestItem(Item):
-            name = fields.StringField()
+            name = fields.TextField()
             number = fields.IntegerField()
 
         i = TestItem()
@@ -87,7 +87,7 @@ class NewItemTest(unittest.TestCase):
 
     def test_private_attr(self):
         class TestItem(Item):
-            name = fields.StringField()
+            name = fields.TextField()
 
         i = TestItem()
         i._private = 'test'
@@ -95,7 +95,7 @@ class NewItemTest(unittest.TestCase):
 
     def test_custom_methods(self):
         class TestItem(Item):
-            name = fields.StringField()
+            name = fields.TextField()
 
             def get_name(self):
                 return self.name
@@ -257,9 +257,9 @@ class NewItemFieldsTest(unittest.TestCase):
 
         self.assertRaises(ValueError, set_invalid_value)
 
-    def test_string_field(self):
+    def test_text_field(self):
         class TestItem(Item):
-            field = fields.StringField()
+            field = fields.TextField()
 
         i = TestItem()