utils.type_name: Support capitalization

pekkaklarck · pekkaklarck · commit 052d3fe38d71 · 2020-03-02T15:21:53.000+02:00
This may help with PR robotframework#3350.
diff --git a/src/robot/utils/robottypes2.py b/src/robot/utils/robottypes2.py
@@ -70,9 +70,10 @@ def is_dict_like(item):
     return isinstance(item, (Mapping, UserDict))
 
 
-def type_name(item):
+def type_name(item, capitalize=False):
     cls = item.__class__ if hasattr(item, '__class__') else type(item)
     named_types = {str: 'string', unicode: 'string', bool: 'boolean',
                    int: 'integer', long: 'integer', NoneType: 'None',
                    dict: 'dictionary', type: 'class', ClassType: 'class'}
-    return named_types.get(cls, cls.__name__)
+    name = named_types.get(cls, cls.__name__)
+    return name.capitalize() if capitalize and name.islower() else name
diff --git a/src/robot/utils/robottypes3.py b/src/robot/utils/robottypes3.py
@@ -67,10 +67,12 @@ def is_dict_like(item):
     return isinstance(item, Mapping)
 
 
-def type_name(item):
+def type_name(item, capitalize=False):
     if isinstance(item, IOBase):
-        return 'file'
-    cls = item.__class__ if hasattr(item, '__class__') else type(item)
-    named_types = {str: 'string', bool: 'boolean', int: 'integer',
-                   type(None): 'None', dict: 'dictionary', type: 'class'}
-    return named_types.get(cls, cls.__name__)
+        name = 'file'
+    else:
+        cls = item.__class__ if hasattr(item, '__class__') else type(item)
+        named_types = {str: 'string', bool: 'boolean', int: 'integer',
+                       type(None): 'None', dict: 'dictionary', type: 'class'}
+        name = named_types.get(cls, cls.__name__)
+    return name.capitalize() if capitalize and name.islower() else name
diff --git a/utest/utils/test_robottypes.py b/utest/utils/test_robottypes.py
@@ -23,6 +23,7 @@
 
 if PY3:
     long = int
+    xrange = range
 
 
 class MyMapping(Mapping):
@@ -89,10 +90,6 @@ def __iter__(self):
         assert_equal(is_list_like(O()), False)
 
     def test_other_iterables_are_list_like(self):
-        try:
-            xrange
-        except NameError:
-            xrange = range
         for thing in [[], (), set(), xrange(1), generator(), array('i'), UserList()]:
             assert_equal(is_list_like(thing), True, thing)
 
@@ -129,12 +126,19 @@ def test_java_maps(self):
 class TestTypeName(unittest.TestCase):
 
     def test_base_types(self):
-        for item, exp in [('bytes', 'string'), (u'unicode', 'string'),
-                          (b'real bytes', 'string' if bytes is str else 'bytes'),
+        for item, exp in [('string', 'string'),
+                          (u'unicode', 'string'),
+                          (b'bytes', 'bytes' if PY3 else 'string'),
                           (bytearray(), 'bytearray'),
-                          (1, 'integer'), (long(1), 'integer'), (1.0, 'float'),
-                          (True, 'boolean'), (None, 'None'), (set(), 'set'),
-                          ([], 'list'), ((), 'tuple'), ({}, 'dictionary')]:
+                          (1, 'integer'),
+                          (long(1), 'integer'),
+                          (1.0, 'float'),
+                          (True, 'boolean'),
+                          (None, 'None'),
+                          (set(), 'set'),
+                          ([], 'list'),
+                          ((), 'tuple'),
+                          ({}, 'dictionary')]:
             assert_equal(type_name(item), exp)
 
     def test_file(self):
@@ -144,17 +148,31 @@ def test_file(self):
     def test_custom_objects(self):
         class NewStyle(object): pass
         class OldStyle: pass
-        for item, exp in [(NewStyle(), 'NewStyle'), (OldStyle(), 'OldStyle'),
-                          (NewStyle, 'class'), (OldStyle, 'class')]:
+        class lower: pass
+        for item, exp in [(NewStyle(), 'NewStyle'),
+                          (OldStyle(), 'OldStyle'),
+                          (lower(), 'lower'),
+                          (NewStyle, 'class'),
+                          (OldStyle, 'class')]:
             assert_equal(type_name(item), exp)
 
     if JYTHON:
 
         def test_java_object(self):
-            for item, exp in [(String(), 'String'), (String, 'Class'),
-                              (java.lang, 'javapackage'), (java, 'javapackage')]:
+            for item, exp in [(String(), 'String'),
+                              (String, 'Class'),
+                              (java.lang, 'javapackage'),
+                              (java, 'javapackage')]:
                 assert_equal(type_name(item), exp)
 
+    def test_capitalize(self):
+        class lowerclass: pass
+        class CamelClass: pass
+        assert_equal(type_name('string', capitalize=True), 'String')
+        assert_equal(type_name(None, capitalize=True), 'None')
+        assert_equal(type_name(lowerclass(), capitalize=True), 'Lowerclass')
+        assert_equal(type_name(CamelClass(), capitalize=True), 'CamelClass')
+
 
 class TestIsTruthyFalsy(unittest.TestCase):
 
