Remove remaining c['www']['url']

This removes all the occurrences of ['www']['url'] after commit b53998a
buildbot · Dec 5, 2014 · 2d594c1 · 2d594c1
1 parent 845ad50
commit 2d594c1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/master/buildbot/test/integration/test_www.py b/master/buildbot/test/integration/test_www.py
@@ -76,7 +76,6 @@ def setUp(self):
             port='tcp:0:interface=127.0.0.1',
             debug=True,
             auth=auth.NoAuth(),
-            url="not yet known",
             avatar_methods=[],
             logfileName='http.log')
         master.www = wwwservice.WWWService(master)
@@ -87,7 +86,7 @@ def setUp(self):
         # the config.  The second reconfig isn't really required, but doesn't
         # hurt.
         self.url = 'http://127.0.0.1:%d/' % master.www.getPortnum()
-        master.config.www['url'] = self.url
+        master.config.buildbotURL = self.url
         yield master.www.reconfigServiceWithBuildbotConfig(master.config)
 
         self.master = master

diff --git a/master/buildbot/www/avatar.py b/master/buildbot/www/avatar.py
@@ -47,7 +47,7 @@ class AvatarResource(resource.Resource):
 
     def reconfigResource(self, new_config):
         self.avatarMethods = new_config.www.get('avatar_methods', [])
-        self.defaultAvatarFullUrl = urljoin(new_config.www['url'], self.defaultAvatarUrl)
+        self.defaultAvatarFullUrl = urljoin(new_config.buildbotURL, self.defaultAvatarUrl)
         self.cache = {}
         # ensure the avatarMethods is a iterable
         if isinstance(self.avatarMethods, AvatarBase):

diff --git a/master/buildbot/www/oauth2.py b/master/buildbot/www/oauth2.py
@@ -69,8 +69,8 @@ def __init__(self,
 
     def reconfigAuth(self, master, new_config):
         self.master = master
-        self.loginUri = join(new_config.www['url'], "auth/login")
-        self.homeUri = new_config.www['url']
+        self.loginUri = join(new_config.buildbotURL, "auth/login")
+        self.homeUri = new_config.buildbotURL
 
     def getConfigDict(self):
         return dict(name=self.name,

diff --git a/master/buildbot/www/resource.py b/master/buildbot/www/resource.py
@@ -39,7 +39,7 @@ class Resource(resource.Resource):
 
     @property
     def base_url(self):
-        return self.master.config.www['url']
+        return self.master.config.buildbotURL
 
     def __init__(self, master):
         resource.Resource.__init__(self)

diff --git a/master/buildbot/www/rest.py b/master/buildbot/www/rest.py
@@ -374,8 +374,8 @@ def writeError(msg, errcode=404, jsonrpccode=None):
                 request.write(data)
 
     def reconfigResource(self, new_config):
-        # www['url'] will always ends with a '/', not the Origin header.
-        origin_self = new_config.www['url'].rstrip('/')
+        # buildbotURL will always ends with a '/', not the Origin header.
+        origin_self = new_config.buildbotURL.rstrip('/')
         # pre-translate the origin entries in the config
         self.origins = [re.compile(fnmatch.translate(o.lower()))
                         for o in new_config.www.get('allowed_origins',