Docserver: Gitiles auth and cron refactoring.

chrome/common/extensions/docs/server2/jsc_view.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from copy import copy
 import logging
 import posixpath
 
 from api_models import GetNodeCategories
 from api_schema_graph import APINodeCursor
@@ skipping 98 matching lines @@
       'events': self._GenerateEvents(self._jsc_model.events),
       'domEvents': self._GenerateDomEvents(self._jsc_model.events),
       'properties': self._GenerateProperties(self._jsc_model.properties),
       'introList': self._GetIntroTableList(),
       'channelWarning': self._GetChannelWarning(),
     }
     if self._jsc_model.deprecated:
       as_dict['deprecated'] = self._jsc_model.deprecated
 
     as_dict['byName'] = _GetByNameDict(as_dict)
+
     return as_dict
 
   def _IsExperimental(self):
     return self._jsc_model.name.startswith('experimental')
 
   def _GetChannelWarning(self):
     if not self._IsExperimental():
       return {
         self._availability.channel_info.channel: True
       }
@@ skipping 252 matching lines @@
           dst_dict['enum_values'][-1]['last'] = True
       elif type_.instance_of is not None:
         dst_dict['simple_type'] = type_.instance_of
       else:
         dst_dict['simple_type'] = type_.property_type.name
 
   def _CreateAvailabilityTemplate(self, status, scheduled, version):
     '''Returns an object suitable for use in templates to display availability
     information.
     '''
+    # TODO(rockot): Temporary hack. Remove this very soon.
+    if status == 'master':
+      status = 'trunk'
     return {
       'partial': self._template_cache.GetFromFile(
           '%sintro_tables/%s_message.html' % (PRIVATE_TEMPLATES, status)).Get(),
       'scheduled': scheduled,
       'version': version
     }
 
   def _GetAvailabilityTemplate(self):
     '''Gets availability for the current node and returns an appropriate
     template object.
@@ skipping 152 matching lines @@
         # converted to a Motemplate object, transform it to a template.
         if 'partial' in node:
           # Note: it's enough to copy() not deepcopy() because only a single
           # top-level key is being modified.
           node = copy(node)
           node['partial'] = self._template_cache.GetFromFile(
               posixpath.join(PRIVATE_TEMPLATES, node['partial'])).Get()
         content.append(node)
       misc_rows.append({ 'title': category, 'content': content })
     return misc_rows