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

Unified Diff: third_party/cq_client/validate_config.py

Issue 1490473004: Roll CQ client changes 7d916d5..f59ed9f (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 5 years 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
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 b6d73db9b1107af81f282f0692ad7b3c8f67350d..359ede829c279d5bbc884eae0fd02dde299488d0 100644
--- a/third_party/cq_client/validate_config.py
+++ b/third_party/cq_client/validate_config.py
@@ -6,14 +6,7 @@
"""CQ config validation library."""
import argparse
-# This file was originally copied together with the cq_client library from the
-# internal commit_queue repository and then modified to import protobuf26
Sergiy Byelozyorov 2015/12/01 10:27:54 same here
-# instead of google.protobuf to prevent conflicts with a different version of
-# google.protobuf that some users of depot_tools have installed. If you need to
-# update this file, please make similar changes again and add this comment back.
-# More details on why we chose to rename the package can be found in the file
-# depot_tools/third_party/protobuf26/README.chromium.
-import protobuf26 as protobuf
+from google import protobuf
import logging
import re
import sys
« third_party/cq_client/cq_pb2.py ('K') | « third_party/cq_client/test/cq_rietveld.cfg ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698