[recipes.cfg] ONLY support jsonpb.

recipe_engine/package.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import copy
 import difflib
 import json
 import logging
 import operator
 import os
 import subprocess
 import sys
 
 from . import env
 
-from google.protobuf import text_format
 from google.protobuf import json_format
 from . import package_pb2
 from . import fetch
 
 
 class InconsistentDependencyGraphError(Exception):
   def __init__(self, project_id, specs):
     self.project_id = project_id
     self.specs = specs
 
@@ skipping 30 matching lines @@
                 os.path.abspath(recipes_cfg)))) # recipes.cfg
 
 
 class ProtoFile(object):
   """A collection of functions operating on a proto path.
 
   This is an object so that it can be mocked in the tests.
   """
   def __init__(self, path):
     self._path = path
-    # TODO(iannucci): remove text proto support
-    self._is_json = False
-    try:
-      self._is_json = self.read_raw().lstrip().startswith('{')
-    except IOError:
-      pass
 
   @property
   def path(self):
     return os.path.realpath(self._path)
 
   def read_raw(self):
     with open(self._path, 'r') as fh:
       return fh.read()
 
   def read(self):
     text = self.read_raw()
     buf = package_pb2.Package()
-    if text.lstrip().startswith('{'):
-      self._is_json = True
-      json_format.Parse(text, buf, ignore_unknown_fields=True)
-    else:
-      text_format.Merge(text, buf)
+    json_format.Parse(text, buf, ignore_unknown_fields=True)
     return buf
 
   def to_raw(self, buf):
-    if self._is_json:
-      obj = json_format.MessageToDict(buf, preserving_proto_field_name=True)
-      return json.dumps(obj, indent=2, sort_keys=True).replace(' \n', '\n')
-    else:
-      return text_format.MessageToString(buf)
+    obj = json_format.MessageToDict(buf, preserving_proto_field_name=True)
+    return json.dumps(obj, indent=2, sort_keys=True).replace(' \n', '\n')
 
   def write(self, buf):
     with open(self._path, 'w') as fh:
       fh.write(self.to_raw(buf))
 
 
 class PackageContext(object):
   """Contains information about where the root package and its dependency
   checkouts live.
 
@@ skipping 598 matching lines @@
   >>> d = { 'x': 1, 'y': 2 }
   >>> sorted(_updated(d, { 'y': 3, 'z': 4 }).items())
   [('x', 1), ('y', 3), ('z', 4)]
   >>> sorted(d.items())
   [('x', 1), ('y', 2)]
   """
 
   d = copy.copy(d)
   d.update(updates)
   return d