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

Unified Diff: third_party/cq_client/validate_config.py

Issue 1407953011: Re-land: Removed virtualenv from depot_tools (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Re-added files that were present before virtualenv Created 5 years, 1 month 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') | third_party/protobuf26/README.chromium » ('j') | 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 17d91dbb32c72d329427cf167b1ea2369a4f6849..51fa7cf2b30daf240664a778270f0339dfcc20b8 100644
--- a/third_party/cq_client/validate_config.py
+++ b/third_party/cq_client/validate_config.py
@@ -6,7 +6,14 @@
"""CQ config validation library."""
import argparse
-from google import protobuf
+# This file was originally copied together with the cq_client library from the
+# internal commit_queue repository and then modified to import protobuf26
+# 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
import logging
import re
import sys
« no previous file with comments | « third_party/cq_client/cq_pb2.py ('k') | third_party/protobuf26/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698