Index: tools/telemetry/telemetry/core/discover.py |
diff --git a/tools/telemetry/telemetry/core/discover.py b/tools/telemetry/telemetry/core/discover.py |
index ece12f9fc9dabda095ded8114b8f711fa24241be..10cc73139b3e67b4f915d5e7338651b9ad5bdb86 100644 |
--- a/tools/telemetry/telemetry/core/discover.py |
+++ b/tools/telemetry/telemetry/core/discover.py |
@@ -1,11 +1,14 @@ |
# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
+ |
import fnmatch |
import inspect |
import os |
import re |
+from telemetry.core import camel_case |
+ |
def DiscoverModules(start_dir, top_level_dir, pattern='*'): |
"""Discover all modules in |start_dir| which match |pattern|. |
@@ -65,7 +68,7 @@ def DiscoverClasses(start_dir, top_level_dir, base_class, pattern='*', |
if (inspect.isclass(obj) and obj is not base_class and |
issubclass(obj, base_class)): |
if index_by_class_name: |
- key_name = re.sub('(?!^)([A-Z]+)', r'_\1', obj.__name__).lower() |
+ key_name = camel_case.ToUnderscore(obj.__name__) |
else: |
key_name = module.__name__.split('.')[-1] |
classes[key_name] = obj |