mirror of https://github.com/scrapy/scrapy.git
utils: remove unused function arg_to_list
--HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%401016
This commit is contained in:
parent
de0d57cd9b
commit
9d59bb3153
|
|
@ -1,7 +1,7 @@
|
|||
import unittest
|
||||
from cStringIO import StringIO
|
||||
|
||||
from scrapy.utils.misc import hash_values, items_to_csv, load_object, arg_to_list, arg_to_iter
|
||||
from scrapy.utils.misc import hash_values, items_to_csv, load_object, arg_to_iter
|
||||
from scrapy.item import ScrapedItem
|
||||
|
||||
class UtilsMiscTestCase(unittest.TestCase):
|
||||
|
|
@ -61,19 +61,6 @@ class UtilsMiscTestCase(unittest.TestCase):
|
|||
self.assertRaises(ImportError, load_object, 'nomodule999.mod.function')
|
||||
self.assertRaises(NameError, load_object, 'scrapy.utils.misc.load_object999')
|
||||
|
||||
def test_arg_to_list(self):
|
||||
self.assertEqual(arg_to_list(None), [])
|
||||
self.assertEqual(arg_to_list('lala'), ['lala'])
|
||||
self.assertEqual(arg_to_list(100), [100])
|
||||
self.assertEqual(arg_to_list(('lala', 'poo')), ['lala', 'poo'])
|
||||
|
||||
def test_arg_to_list(self):
|
||||
self.assertEqual(arg_to_list(None), [])
|
||||
self.assertEqual(arg_to_list('lala'), ['lala'])
|
||||
self.assertEqual(arg_to_list(100), [100])
|
||||
self.assertEqual(arg_to_list(('lala', 'poo')), ['lala', 'poo'])
|
||||
self.assertEqual(arg_to_list(s for s in ['lala', 'poo']), ['lala', 'poo'])
|
||||
|
||||
def test_arg_to_iter(self):
|
||||
assert hasattr(arg_to_iter(None), '__iter__')
|
||||
assert hasattr(arg_to_iter(100), '__iter__')
|
||||
|
|
|
|||
|
|
@ -14,20 +14,6 @@ from scrapy.utils.python import flatten, unicode_to_str
|
|||
from scrapy.utils.markup import remove_entities
|
||||
from scrapy.utils.defer import defer_succeed
|
||||
|
||||
def arg_to_list(arg):
|
||||
"""Convert an argument to list, so that it can be iterated. The argument
|
||||
can be a None, single value, or an iterable.
|
||||
|
||||
This is meant to be used in functions for arguments which can be either
|
||||
None, single valued or multi-valued.
|
||||
"""
|
||||
if arg is None:
|
||||
return []
|
||||
elif hasattr(arg, '__iter__'):
|
||||
return list(arg)
|
||||
else:
|
||||
return [arg]
|
||||
|
||||
def arg_to_iter(arg):
|
||||
"""Convert an argument to an iterable. The argument can be a None, single
|
||||
value, or an iterable.
|
||||
|
|
|
|||
Loading…
Reference in New Issue