Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Unified Diff: third_party/cq_client/validate_config.py

Issue 1195423002: Use virtualenv to run commit_queue script (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Update depot_tools before running commit_queue binary Created 5 years, 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/cq_client/cq_pb2.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/cq_client/validate_config.py
diff --git a/third_party/cq_client/validate_config.py b/third_party/cq_client/validate_config.py
index 1e34b868e1172e0222856d9a8a79a09397c1460a..17d91dbb32c72d329427cf167b1ea2369a4f6849 100644
--- a/third_party/cq_client/validate_config.py
+++ b/third_party/cq_client/validate_config.py
@@ -6,11 +6,7 @@
"""CQ config validation library."""
import argparse
-# The 'from google import protobuf' below was replaced to fix an issue where
-# some users may have built-in google package installed on their system, which
-# is incompatible with cq_pb2 below. This hack can be removed after
-# http://crbug.com/503067 is resolved.
-import protobuf26 as protobuf
+from google import protobuf
import logging
import re
import sys
« no previous file with comments | « third_party/cq_client/cq_pb2.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698