Revision: 3590
Author: pekka.klarck
Date: Thu May 27 10:05:40 2010
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=3590
Modified:
/trunk/src/robot/utils/misc.py
/trunk/utest/utils/test_misc.py
=======================================
--- /trunk/src/robot/utils/misc.py Thu May 27 07:21:26 2010
+++ /trunk/src/robot/utils/misc.py Thu May 27 10:05:40 2010
@@ -80,21 +80,15 @@
def seq2str(sequence, quote="'", sep=', ', lastsep=' and '):
- """Returns sequence in format 'item 1', 'item 2' and 'item 3' """
+ """Returns sequence in format 'item 1', 'item 2' and 'item 3'"""
quote_elem = lambda string: quote + unic(string) + quote
- if isinstance(sequence, basestring):
- return quote_elem(sequence)
if len(sequence) == 0:
return ''
if len(sequence) == 1:
return quote_elem(sequence[0])
- ret = []
- for i in range(len(sequence)):
- if i + 2 == len(sequence):
- ret.append(quote_elem(sequence[i]) + lastsep +
quote_elem(sequence[i+1]))
- break
- ret.append(quote_elem(sequence[i]))
- return sep.join(ret)
+ elems = [quote_elem(s) for s in sequence[:-2]]
+ elems.append(quote_elem(sequence[-2]) + lastsep +
quote_elem(sequence[-1]))
+ return sep.join(elems)
def seq2str2(sequence):
=======================================
--- /trunk/utest/utils/test_misc.py Thu May 27 07:11:21 2010
+++ /trunk/utest/utils/test_misc.py Thu May 27 10:05:40 2010
@@ -13,12 +13,11 @@
class TestMiscUtils(unittest.TestCase):
def test_seq2str(self):
- for exp, seq in [ ( "", () ),
- ( "'One'", ("One",) ),
- ( "'1' and '2'", ("1","2") ),
- ( "'1', '2', '3', 'f o u r', 'fi ve' and '6'",
- ("1","2","3","f o u r","fi ve","6") ) ]:
- assert_equals(exp, seq2str(seq))
+ for seq, expected in [((), ''), ([], ''), (set(), ''),
+ (['One'], "'One'"),
+ (['1', '2'], "'1' and '2'"),
+ (['a', 'b', 'c', 'd'], "'a', 'b', 'c'
and 'd'")]:
+ assert_equals(seq2str(seq), expected)
def test_get_link_path(self):
if os.sep == '/':
