Extensions Docs Server: BranchUtility not fetching branch numbers correctly (fixed)

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

Index: chrome/common/extensions/docs/server2/handler.py
diff --git a/chrome/common/extensions/docs/server2/handler.py b/chrome/common/extensions/docs/server2/handler.py
index 4f4f9de7e68122109841c36d7d2bf25b61913b0f..e306ea7a61193003b9433ce252dffccf06a2c9b2 100644
--- a/chrome/common/extensions/docs/server2/handler.py
+++ b/chrome/common/extensions/docs/server2/handler.py
@@ -39,7 +39,7 @@ OMAHA_PROXY_URL = 'http://omahaproxy.appspot.com/json'
 BRANCH_UTILITY_MEMCACHE = AppEngineMemcache('branch_utility')
 BRANCH_UTILITY = BranchUtility(OMAHA_PROXY_URL,
                                DEFAULT_BRANCH,
-                               AppEngineUrlFetcher(''),
+                               AppEngineUrlFetcher(None),
                                BRANCH_UTILITY_MEMCACHE)
 
 STATIC_DIR_PREFIX = 'docs/server2'
@@ -105,6 +105,13 @@ def _GetURLFromBranch(branch):
       return TRUNK_URL + '/src'
     return BRANCH_URL + '/' + branch + '/src'
 
+def _CleanBranches():
+  numbers = [BRANCH_UTILITY.GetBranchNumberForChannelName(branch)
+             for branch in ['dev', 'beta', 'stable', 'trunk', 'local']]

[not at google - send to devlin, 2012/08/13 00:53:00]

currently only the branch utility knows what the actual branches are. Let's keep
it that way and put this method on branch utility (like GetAllBranchNumbers).

[cduvall, 2012/08/13 21:45:04]

Done.

+  for key in SERVER_INSTANCES.keys():
+    if key not in numbers:
+      SERVER_INSTANCES.pop(key)
+
 class Handler(webapp.RequestHandler):
   def __init__(self, request, response, local_path=EXTENSIONS_PATH):
     self._local_path = local_path
@@ -118,8 +125,9 @@ class Handler(webapp.RequestHandler):
       real_path = 'apps/index.html'
     if real_path.strip('/') == 'extensions':
       real_path = 'extensions/index.html'
-    # TODO: This leaks Server instances when branch bumps.
+    _CleanBranches()
     _GetInstanceForBranch(branch, self._local_path).Get(real_path,
+                                                        channel_name,

[not at google - send to devlin, 2012/08/13 00:53:00]

why can't this go in the constructor of template_data_source? I.e. pass into
_GetInstanceForBranch and thread through like that.

In fact you wouldn't need to pass branch into there, you could make
_GetInstanceForBranch figure it out for itself.

[cduvall, 2012/08/13 21:45:04]

Done.

                                                         self.request,
                                                         self.response)