tools/metrics/common/presubmit_util.py - Issue 1143323006: Histograms.xml python script housekeeping

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/metrics/common/presubmit_util.py

Issue 1143323006: Histograms.xml python script housekeeping (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bad_message

Patch Set: Fix imports (sadface) Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tools/metrics/common/presubmit_util.py

diff --git a/tools/metrics/common/presubmit_util.py b/tools/metrics/common/presubmit_util.py

index ba87d3a1a9c354baa62e7595aea60b6285d77a57..337b355b77d2527d71dccd984dad3d4c1e2d73c7 100644

--- a/tools/metrics/common/presubmit_util.py

+++ b/tools/metrics/common/presubmit_util.py

@@ -7,10 +7,10 @@ import sys

import logging

import shutil

-import diff_util

sys.path.insert(1, os.path.join(sys.path[0], '..', '..', 'python'))

-from google import path_utils

+import google.path_utils

+import diff_util

def DoPresubmitMain(argv, original_filename, backup_filename, script_name,

prettyFn):

@@ -34,7 +34,7 @@ def DoPresubmitMain(argv, original_filename, backup_filename, script_name,

# Otherwise, use the one residing in the same directory as this script.

xml_dir = os.getcwd()

if not os.path.isfile(os.path.join(xml_dir, original_filename)):

- xml_dir = path_utils.ScriptDir()

+ xml_dir = google.path_utils.ScriptDir()

xml_path = os.path.join(xml_dir, original_filename)