Defines the geolocation.
+ ${MODEL}[dataTypes][typedDicts][0][type] TypedDict + ${MODEL}[dataTypes][typedDicts][0][name] GeoLocation + ${MODEL}[dataTypes][typedDicts][0][doc]Defines the geolocation.
+ ...latitude Latitude between -90 and 90.longitude Longitude between -180 and 180.accuracy Optional Non-negative accuracy value. Defaults to 0.Example usage: {'latitude': 59.95, 'longitude': 30.31667}
Defines the geolocation.
...latitude Latitude between -90 and 90.longitude Longitude between -180 and 180.This is some Doc
+ ${MODEL}[dataTypes][enums][0][type] Enum + ${MODEL}[dataTypes][enums][0][name] AssertionOperator + ${MODEL}[dataTypes][enums][0][doc]This is some Doc
+ ...This has was defined by assigning to __doc__.
+ ${MODEL}[types][0][type] Enum + ${MODEL}[types][0][name] AssertionOperator + ${MODEL}[types][0][doc]This is some Doc
...This has was defined by assigning to __doc__.
Enum Members [Template] NONE ${exp_list} Evaluate [{"name": "equal","value": "=="},{"name": "==","value": "=="},{"name": "<","value": "<"},{"name": ">","value": ">"},{"name": "<=","value": "<="},{"name": ">=","value": ">="}] - FOR ${cur} ${exp} IN ZIP ${Model}[dataTypes][enums][0][members] ${exp_list} + FOR ${cur} ${exp} IN ZIP ${MODEL}[dataTypes][enums][0][members] ${exp_list} + Dictionaries Should Be Equal ${cur} ${exp} + END + FOR ${cur} ${exp} IN ZIP ${MODEL}[types][0][members] ${exp_list} Dictionaries Should Be Equal ${cur} ${exp} END Custom types - ${Model}[dataTypes][customs][0][type] Custom - ${Model}[dataTypes][customs][0][name] CustomType - ${Model}[dataTypes][customs][0][doc]Converter method doc is used when defined.
- ${Model}[dataTypes][customs][1][type] Custom - ${Model}[dataTypes][customs][1][name] CustomType2 - ${Model}[dataTypes][customs][1][doc]Class doc is used when converter method has no doc.
+ ${Model}[types][1][type] Custom + ${Model}[types][1][name] CustomType + ${Model}[types][1][doc]Converter method doc is used when defined.
+ ${Model}[types][2][type] Custom + ${Model}[types][2][name] CustomType2 + ${Model}[types][2][doc]Class doc is used when converter method has no doc.
Usages ${MODEL}[types][1][type] Custom diff --git a/atest/testdata/libdoc/DataTypesLibrary.json b/atest/testdata/libdoc/DataTypesLibrary.json index 0dffcfd55c1..fcf8c5c1442 100644 --- a/atest/testdata/libdoc/DataTypesLibrary.json +++ b/atest/testdata/libdoc/DataTypesLibrary.json @@ -2,7 +2,7 @@ "name": "DataTypesLibrary", "doc": "This Library has Data Types.
\nIt has some in __init__ and others in the Keywords.
The DataTypes are the following that should be linked. HttpCredentials , GeoLocation , Small and AssertionOperator.
", "version": "", - "generated": "2022-02-06 18:55:20", + "generated": "2022-02-07 01:13:37", "type": "LIBRARY", "scope": "TEST", "docFormat": "HTML", @@ -210,18 +210,6 @@ } ], "dataTypes": { - "customs": [ - { - "type": "Custom", - "name": "CustomType", - "doc": "Converter method doc is used when defined.
" - }, - { - "type": "Custom", - "name": "CustomType2", - "doc": "Class doc is used when converter method has no doc.
" - } - ], "enums": [ { "type": "Enum", diff --git a/atest/testdata/libdoc/DynamicLibrary.json b/atest/testdata/libdoc/DynamicLibrary.json index 560365b4c28..6cd3c8dc7eb 100644 --- a/atest/testdata/libdoc/DynamicLibrary.json +++ b/atest/testdata/libdoc/DynamicLibrary.json @@ -590,8 +590,7 @@ ], "dataTypes": { "enums": [], - "typedDicts": [], - "customs": [] + "typedDicts": [] }, "types": [] } diff --git a/src/robot/libdocpkg/jsonbuilder.py b/src/robot/libdocpkg/jsonbuilder.py index ebc59052e24..edb8f5dc4ad 100644 --- a/src/robot/libdocpkg/jsonbuilder.py +++ b/src/robot/libdocpkg/jsonbuilder.py @@ -102,8 +102,6 @@ def _parse_data_types(self, data_types): yield self._create_enum_doc(obj) for obj in data_types['typedDicts']: yield self._create_typed_dict_doc(obj) - for obj in data_types['customs']: - yield self._create_custom_doc(obj) def _create_enum_doc(self, data): return EnumDoc(name=data['name'], diff --git a/src/robot/libdocpkg/model.py b/src/robot/libdocpkg/model.py index dae33770bdc..84aa11ae7a4 100644 --- a/src/robot/libdocpkg/model.py +++ b/src/robot/libdocpkg/model.py @@ -125,9 +125,7 @@ def to_dictionary(self): def _get_data_types(self, types): enums = sorted(t for t in types if t.type == 'Enum') typed_dicts = sorted(t for t in types if t.type == 'TypedDict') - customs = sorted(t for t in types if t.type == 'Custom') return { - 'customs': [t.to_dictionary(usages=False) for t in customs], 'enums': [t.to_dictionary(usages=False) for t in enums], 'typedDicts': [t.to_dictionary(usages=False) for t in typed_dicts] } diff --git a/src/robot/libdocpkg/xmlbuilder.py b/src/robot/libdocpkg/xmlbuilder.py index 8b2ea4142b6..5324dffc2c8 100644 --- a/src/robot/libdocpkg/xmlbuilder.py +++ b/src/robot/libdocpkg/xmlbuilder.py @@ -114,8 +114,6 @@ def _parse_data_types(self, spec): yield self._create_enum_doc(elem) for elem in spec.findall('datatypes/typeddicts/typeddict'): yield self._create_typed_dict_doc(elem) - for elem in spec.findall('datatypes/customs/custom'): - yield self._create_custom_doc(elem) def _create_enum_doc(self, elem): return EnumDoc(name=elem.get('name'), diff --git a/src/robot/libdocpkg/xmlwriter.py b/src/robot/libdocpkg/xmlwriter.py index 3253deb2076..1d3892bcf64 100644 --- a/src/robot/libdocpkg/xmlwriter.py +++ b/src/robot/libdocpkg/xmlwriter.py @@ -121,13 +121,6 @@ def _write_data_types(self, types, writer): self._write_typed_dict_items(typ_dict, writer) writer.end('typeddict') writer.end('typeddicts') - if customs: - writer.start('customs') - for typ in customs: - writer.start('custom', {'name': typ.name}) - writer.element('doc', typ.doc) - writer.end('custom') - writer.end('customs') writer.end('datatypes') def _write_types(self, types, writer):