Commit 47050f8b authored by Raul Tambre's avatar Raul Tambre Committed by Commit Bot

ukm: Don't use unicode type

The unicode type no longer exists in Python 3.
All UKM data seems to be ASCII, so we can go the easy route and use the str type.

Traceback (most recent call last):
  File "../../tools/metrics/ukm/gen_builders.py", line 16, in <module>
    import ukm_model
  File "C:\Google\chromium\src\tools\metrics\ukm\ukm_model.py", line 31, in <module>
    ('type', unicode, None),
NameError: name 'unicode' is not defined

Bug: 941669
Change-Id: I54542ea0e6f186432a75b24763486bac2624b163
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2081813
Auto-Submit: Raul Tambre <raul@tambre.ee>
Commit-Queue: Brian White <bcwhite@chromium.org>
Reviewed-by: default avatarBrian White <bcwhite@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748419}
parent a3895a0f
......@@ -28,21 +28,21 @@ _ENUMERATION_TYPE = models.ObjectNodeType(
_QUANTILES_TYPE = models.ObjectNodeType(
'quantiles',
attributes=[
('type', unicode, None),
('type', str, None),
],
single_line=True)
_INDEX_TYPE = models.ObjectNodeType(
'index',
attributes=[
('fields', unicode, None),
('fields', str, None),
],
single_line=True)
_STATISTICS_TYPE = models.ObjectNodeType(
'statistics',
attributes=[
('export', unicode, r'^(?i)(|true|false)$'),
('export', str, r'^(?i)(|true|false)$'),
],
children=[
models.ChildType(_QUANTILES_TYPE.tag, _QUANTILES_TYPE, multiple=False),
......@@ -72,9 +72,9 @@ _AGGREGATION_TYPE = models.ObjectNodeType(
_METRIC_TYPE = models.ObjectNodeType(
'metric',
attributes=[
('name', unicode, r'^[A-Za-z0-9_.]+$'),
('semantic_type', unicode, None),
('enum', unicode, None),
('name', str, r'^[A-Za-z0-9_.]+$'),
('semantic_type', str, None),
('enum', str, None),
],
alphabetization=[
(_OBSOLETE_TYPE.tag, _KEEP_ORDER),
......@@ -93,8 +93,8 @@ _METRIC_TYPE = models.ObjectNodeType(
_EVENT_TYPE = models.ObjectNodeType(
'event',
attributes=[
('name', unicode, r'^[A-Za-z0-9.]+$'),
('singular', unicode, r'^(?i)(|true|false)$'),
('name', str, r'^[A-Za-z0-9.]+$'),
('singular', str, r'^(?i)(|true|false)$'),
],
alphabetization=[
(_OBSOLETE_TYPE.tag, _KEEP_ORDER),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment