Revision: ad3525e71604
Branch: default
Author: Pekka Klärck
Date: Wed Sep 12 04:38:19 2012
Log: utils.safe_repr: reverted handling lists, tuples and dicts
specially with IPY because the implementation didn't actually work
http://code.google.com/p/robotframework/source/detail?r=ad3525e71604
Modified:
/src/robot/utils/unic.py
/utest/utils/test_unic.py
=======================================
--- /src/robot/utils/unic.py Wed Sep 12 04:16:19 2012
+++ /src/robot/utils/unic.py Wed Sep 12 04:38:19 2012
@@ -70,10 +70,6 @@
# IronPython omits u prefix from repr(u'foo') but we want to be
consistent.
_safe_repr = safe_repr
def safe_repr(item):
- if isinstance(item, (tuple, list)):
- return type(item)(safe_repr(i) for i in item)
- if isinstance(item, dict):
- return dict((safe_repr(k), safe_repr(v)) for k, v in
item.items())
ret = _safe_repr(item)
if isinstance(item, unicode) and not ret.startswith('u'):
ret = 'u' + ret
=======================================
--- /utest/utils/test_unic.py Wed Sep 12 04:16:19 2012
+++ /utest/utils/test_unic.py Wed Sep 12 04:38:19 2012
@@ -84,11 +84,6 @@
assert_equals(safe_repr(u'foo'), "u'foo'")
assert_equals(safe_repr(u"f'o'o"), "u\"f'o'o\"")
- def test_unicode_items_in_lists_tuples_and_dicts_have_u_prefix(self):
- assert_equals(safe_repr([u'x', u'y']), "[u'x', u'y']")
- assert_equals(safe_repr((u'x', u'y')), "(u'x', u'y')")
- assert_equals(safe_repr({u'x': u'y'}), "{u'x': u'y'}")
-
class UnicodeRepr:
@@ -106,5 +101,6 @@
class ReprFails(object):
def __repr__(self): raise RuntimeError('Failure in __repr__')
+
if __name__ == '__main__':
unittest.main()